Downgrade Python requirement to 3.12

Author: ian-ross

pyproject.toml

@@ -15,7 +15,7 @@ readme = "README.md"
 
 license = "MIT"
 
-requires-python = ">=3.13,<3.14"
+requires-python = ">=3.12,<3.13"
 
 dependencies = [
     "httpx>=0.28.1",

src/AEIC/performance/models/bada.py

@@ -1,8 +1,10 @@
 from typing import Literal
 
+from AEIC.performance.types import SimpleFlightRules
+
 from .base import BasePerformanceModel
 
 
-class BADAPerformanceModel(BasePerformanceModel):
+class BADAPerformanceModel(BasePerformanceModel[SimpleFlightRules]):
     model_type: Literal['BADA']
     ...

src/AEIC/performance/models/base.py

@@ -103,14 +103,14 @@ def from_internal(cls, lto: LTOPerformance) -> LTOPerformanceInput:
         )
 
 
-class BasePerformanceModel[RulesT = SimpleFlightRules](CIBaseModel, ABC):
+class BasePerformanceModel[RulesT](CIBaseModel, ABC):
     """Base class for aircraft performance models.
 
     This a generic class parameterized by the type of flight rules accepted by
-    the class's :meth:`evaluate` method. By default, this is
-    :class:`SimpleFlightRules <AEIC.performance.types.SimpleFlightRules>`, but
-    subclasses can override this to specify more sophisticated flight rule
-    types.
+    the class's :meth:`evaluate` method. For very simple performance models,
+    this will just be the basic :class:`SimpleFlightRules
+    <AEIC.performance.types.SimpleFlightRules>`, but subclasses can override
+    this to specify more sophisticated flight rule types.
 
     (This class uses the pattern of splitting the :meth:`evaluate` method into
     two steps to allow for type checking of the flight rules input before
@@ -160,7 +160,8 @@ def maximum_payload(self) -> float:
     """Optional LTO performance data."""
 
     FLIGHT_RULES_CLASS: ClassVar[type] = SimpleFlightRules
-    """The class type for flight rules accepted by this performance model."""
+    """The class type for flight rules accepted by this performance model.
+    Override in derived classes if a different flight rules type is used."""
 
     @model_validator(mode='after')
     def load_apu_data(self) -> Self:

src/AEIC/performance/models/legacy.py

@@ -321,7 +321,7 @@ def subset(self, rocd: ROCDFilter) -> PerformanceTable:
         )
 
 
-class LegacyPerformanceModel(BasePerformanceModel):
+class LegacyPerformanceModel(BasePerformanceModel[SimpleFlightRules]):
     """Legacy table-based performance model."""
 
     model_type: Literal['legacy']

src/AEIC/performance/models/piano.py

@@ -1,8 +1,10 @@
 from typing import Literal
 
+from AEIC.performance.types import SimpleFlightRules
+
 from .base import BasePerformanceModel
 
 
-class PianoPerformanceModel(BasePerformanceModel):
+class PianoPerformanceModel(BasePerformanceModel[SimpleFlightRules]):
     model_type: Literal['Piano']
     ...

src/AEIC/performance/models/tasopt.py

@@ -1,8 +1,10 @@
 from typing import Literal
 
+from AEIC.performance.types import SimpleFlightRules
+
 from .base import BasePerformanceModel
 
 
-class TASOPTPerformanceModel(BasePerformanceModel):
+class TASOPTPerformanceModel(BasePerformanceModel[SimpleFlightRules]):
     model_type: Literal['TASOPT']
     ...

tests/test_storage.py

@@ -589,9 +589,9 @@ def test_fieldset_override(tmp_path: Path):
         assert ts_read3[1].mf == 12345
 
 
-@pytest.mark.forked
-def test_basic_merging(tmp_path: Path):
+def basic_merging_create_stores(tmp_path: Path):
     # Create a number of trajectory stores with names following a pattern.
+    Config.load()
     paths = []
     for i in range(4):
         path = tmp_path / f'test_{i}.nc'
@@ -601,6 +601,27 @@ def test_basic_merging(tmp_path: Path):
                 t = make_test_trajectory((j + 1) * 5, j + i * 10)
                 ts.add(t)
 
+
+def basic_merging_check_merged_store(merged_path: Path):
+    # Open the merged store and check contents.
+    Config.load()
+    with TrajectoryStore.open(base_file=merged_path) as ts_merged:
+        assert ts_merged.nc_linked is True
+        assert len(ts_merged) == 8
+        assert ts_merged[0].name == 'traj_0'
+        assert ts_merged[7].name == 'traj_31'
+        assert ts_merged[4].flight_time.shape == (5,)
+
+
+@pytest.mark.forked
+def test_basic_merging(tmp_path: Path):
+    # Create a number of trajectory stores with names following a pattern.
+    run_in_subprocess(basic_merging_create_stores, tmp_path)
+    paths = []
+    for i in range(4):
+        path = tmp_path / f'test_{i}.nc'
+        paths.append(path)
+
     # Merge the stores into a new store.
     merged_path = tmp_path / 'merged.aeic-store'
     TrajectoryStore.merge(input_stores=paths, output_store=merged_path)
@@ -610,12 +631,7 @@ def test_basic_merging(tmp_path: Path):
         _ = TrajectoryStore.append(base_file=merged_path)
 
     # Open the merged store and check contents.
-    with TrajectoryStore.open(base_file=merged_path) as ts_merged:
-        assert ts_merged.nc_linked is True
-        assert len(ts_merged) == 8
-        assert ts_merged[0].name == 'traj_0'
-        assert ts_merged[7].name == 'traj_31'
-        assert ts_merged[4].flight_time.shape == (5,)
+    run_in_subprocess(basic_merging_check_merged_store, merged_path)
 
 
 # Split test into subprocesses to avoid issues with NetCDF libraries.