cleanup virtualship/expedition/__init__.py

Author: VeckoTheGecko

src/virtualship/expedition/__init__.py

@@ -1,34 +1,9 @@
 """Everything for simulating an expedition."""
 
-from virtualship.models import (
-    ADCPConfig,
-    ArgoFloatConfig,
-    CTD_BGCConfig,
-    CTDConfig,
-    DrifterConfig,
-    Schedule,
-    ShipConfig,
-    ShipUnderwaterSTConfig,
-    SpaceTimeRegion,
-    Waypoint,
-)
-
 from .do_expedition import do_expedition
 from .input_data import InputData
 
 __all__ = [
-    "ADCPConfig",
-    "ArgoFloatConfig",
-    "CTDConfig",
-    "CTD_BGCConfig",
-    "DrifterConfig",
     "InputData",
-    "InstrumentType",
-    "Schedule",
-    "ShipConfig",
-    "ShipUnderwaterSTConfig",
-    "SpaceTimeRegion",
-    "Waypoint",
     "do_expedition",
-    "instruments",
 ]

tests/expedition/test_simulate_schedule.py

@@ -3,12 +3,12 @@
 import pyproj
 
 from virtualship import Location
-from virtualship.expedition import Schedule, ShipConfig, Waypoint
 from virtualship.expedition.simulate_schedule import (
     ScheduleOk,
     ScheduleProblem,
     simulate_schedule,
 )
+from virtualship.models import Schedule, ShipConfig, Waypoint
 
 
 def test_simulate_schedule_feasible() -> None:

tests/test_utils.py

@@ -1,4 +1,4 @@
-from virtualship.expedition import Schedule, ShipConfig
+from virtualship.models import Schedule, ShipConfig
 from virtualship.utils import get_example_config, get_example_schedule