Merge branch 'v1-dev' of github.com:OceanParcels/virtualship into v1-dev

Author: j-atkins

src/virtualship/instruments/adcp.py

@@ -2,8 +2,8 @@
 from typing import ClassVar
 
 import numpy as np
-
 from parcels import ParticleSet, ScipyParticle, Variable
+
 from virtualship.instruments.base import Instrument
 from virtualship.instruments.types import InstrumentType
 from virtualship.utils import (

src/virtualship/instruments/argo_float.py

@@ -4,14 +4,14 @@
 from typing import ClassVar
 
 import numpy as np
-
 from parcels import (
     AdvectionRK4,
     JITParticle,
     ParticleSet,
     StatusCode,
     Variable,
 )
+
 from virtualship.instruments.base import Instrument
 from virtualship.instruments.types import InstrumentType
 from virtualship.models.spacetime import Spacetime

src/virtualship/instruments/base.py

@@ -8,9 +8,9 @@
 
 import copernicusmarine
 import xarray as xr
+from parcels import FieldSet
 from yaspin import yaspin
 
-from parcels import FieldSet
 from virtualship.errors import CopernicusCatalogueError
 from virtualship.utils import (
     COPERNICUSMARINE_PHYS_VARIABLES,

src/virtualship/instruments/ctd.py

@@ -3,8 +3,8 @@
 from typing import TYPE_CHECKING, ClassVar
 
 import numpy as np
-
 from parcels import JITParticle, ParticleSet, Variable
+
 from virtualship.instruments.base import Instrument
 from virtualship.instruments.types import InstrumentType
 

src/virtualship/instruments/ctd_bgc.py

@@ -3,8 +3,8 @@
 from typing import ClassVar
 
 import numpy as np
-
 from parcels import JITParticle, ParticleSet, Variable
+
 from virtualship.instruments.base import Instrument
 from virtualship.instruments.types import InstrumentType
 from virtualship.models.spacetime import Spacetime

src/virtualship/instruments/drifter.py

@@ -3,8 +3,8 @@
 from typing import ClassVar
 
 import numpy as np
-
 from parcels import AdvectionRK4, JITParticle, ParticleSet, Variable
+
 from virtualship.instruments.base import Instrument
 from virtualship.instruments.types import InstrumentType
 from virtualship.models.spacetime import Spacetime

src/virtualship/instruments/ship_underwater_st.py

@@ -2,8 +2,8 @@
 from typing import ClassVar
 
 import numpy as np
-
 from parcels import ParticleSet, ScipyParticle, Variable
+
 from virtualship.instruments.base import Instrument
 from virtualship.instruments.types import InstrumentType
 from virtualship.utils import add_dummy_UV, register_instrument

src/virtualship/instruments/xbt.py

@@ -3,8 +3,8 @@
 from typing import ClassVar
 
 import numpy as np
-
 from parcels import JITParticle, ParticleSet, Variable
+
 from virtualship.instruments.base import Instrument
 from virtualship.instruments.types import InstrumentType
 from virtualship.models.spacetime import Spacetime

src/virtualship/utils.py

@@ -13,8 +13,8 @@
 import copernicusmarine
 import numpy as np
 import xarray as xr
-
 from parcels import FieldSet
+
 from virtualship.errors import CopernicusCatalogueError
 
 if TYPE_CHECKING:

tests/instruments/test_adcp.py

@@ -4,8 +4,8 @@
 
 import numpy as np
 import xarray as xr
-
 from parcels import FieldSet
+
 from virtualship.instruments.adcp import ADCPInstrument
 from virtualship.models import Location, Spacetime