Mark tests that fail without ixmp4 py3.14 support

khaeru · khaeru · commit 65cfbaeb5ea6 · 2025-10-24T14:03:22.000+02:00
- Add mark 'ixmp4_209' used/handled in iiasa/ixmp#602.
diff --git a/message_ix/tests/model/message/test_cap_comm.py b/message_ix/tests/model/message/test_cap_comm.py
@@ -11,6 +11,7 @@
 if TYPE_CHECKING:
     from ixmp import Platform
 
+pytestmark = pytest.mark.ixmp4_209
 
 COMMON: dict[str, int | str] = dict(
     commodity="coal",
diff --git a/message_ix/tests/model/test_message.py b/message_ix/tests/model/test_message.py
@@ -13,6 +13,8 @@
 if TYPE_CHECKING:
     from ixmp import Platform
 
+pytestmark = pytest.mark.ixmp4_209
+
 #: Periods: one historical, two in the time horizon
 Y = [0, 10, 20]
 
diff --git a/message_ix/tests/report/test_operator.py b/message_ix/tests/report/test_operator.py
@@ -5,6 +5,7 @@
 import matplotlib
 import pandas as pd
 import pyam
+import pytest
 from dask.core import literal
 
 try:
@@ -25,6 +26,7 @@
 # NOTE These tests likely don't need to be parametrized
 
 
+@pytest.mark.ixmp4_209
 def test_as_message_df(test_mp: "Platform") -> None:
     q = random_qty(dict(c=3, h=2, nl=5))
     q.units = "kg"
@@ -84,6 +86,7 @@ def test_as_message_df(test_mp: "Platform") -> None:
     assert q.size == len(s.par("demand"))
 
 
+@pytest.mark.ixmp4_209
 def test_as_pyam(message_test_mp: "Platform") -> None:
     scen = Scenario(message_test_mp, **SCENARIO["dantzig"])
     if not scen.has_solution():
@@ -101,6 +104,7 @@ def test_as_pyam(message_test_mp: "Platform") -> None:
     assert isinstance(p, pyam.IamDataFrame)
 
 
+@pytest.mark.ixmp4_209
 def test_concat(dantzig_reporter: Reporter) -> None:
     """pyam.concat() correctly passes through to ixmp…concat()."""
     rep = dantzig_reporter
diff --git a/message_ix/tests/test_core.py b/message_ix/tests/test_core.py
@@ -17,6 +17,8 @@
 from message_ix import Scenario
 from message_ix.testing import GHA, SCENARIO, make_dantzig, make_westeros
 
+pytestmark = pytest.mark.ixmp4_209
+
 
 @pytest.fixture
 def dantzig_message_scenario(
@@ -393,7 +395,7 @@ def test_add_cat_unique(message_test_mp: ixmp.Platform) -> None:
     assert [1963] == scen2.cat("year", "firstmodelyear")
 
 
-def test_years_active(test_mp: ixmp.Platform) -> None:
+def test_years_active0(test_mp: ixmp.Platform) -> None:
     test_mp.add_unit("year")
     scen = Scenario(test_mp, **SCENARIO["dantzig"], version="new")
     scen.add_set("node", "foo")
@@ -439,7 +441,7 @@ def test_years_active(test_mp: ixmp.Platform) -> None:
     npt.assert_array_equal(result, years[1:-1])
 
 
-def test_years_active_extend(message_test_mp: ixmp.Platform) -> None:
+def test_years_active1(message_test_mp: ixmp.Platform) -> None:
     scen = Scenario(message_test_mp, **SCENARIO["dantzig multi-year"])
 
     # Existing time horizon
@@ -464,7 +466,7 @@ def test_years_active_extend(message_test_mp: ixmp.Platform) -> None:
     npt.assert_array_equal(result, years[1:-1])
 
 
-def test_years_active_extended2(test_mp: ixmp.Platform) -> None:
+def test_years_active2(test_mp: ixmp.Platform) -> None:
     test_mp.add_unit("year")
     scen = Scenario(test_mp, **SCENARIO["dantzig"], version="new")
     scen.add_set("node", "foo")
@@ -511,7 +513,7 @@ def test_years_active_extended2(test_mp: ixmp.Platform) -> None:
     npt.assert_array_equal(result, years[-2])
 
 
-def test_years_active_extend3(test_mp: ixmp.Platform) -> None:
+def test_years_active3(test_mp: ixmp.Platform) -> None:
     test_mp.add_unit("year")
     scen = Scenario(test_mp, **SCENARIO["dantzig"], version="new")
     scen.add_set("node", "foo")
diff --git a/message_ix/tests/test_feature_addon.py b/message_ix/tests/test_feature_addon.py
@@ -1,10 +1,13 @@
 import numpy as np
 import pandas as pd
+import pytest
 from ixmp import Platform
 
 from message_ix import Scenario
 from message_ix.testing import SCENARIO
 
+pytestmark = pytest.mark.ixmp4_209
+
 # First model year of the Dantzig scenario
 _year = 1963
 
diff --git a/message_ix/tests/test_feature_bound_activity_shares.py b/message_ix/tests/test_feature_bound_activity_shares.py
@@ -11,6 +11,8 @@
 from message_ix import ModelError, Scenario, make_df
 from message_ix.testing import make_dantzig
 
+pytestmark = pytest.mark.ixmp4_209
+
 #: First model year of the :func:`.make_dantzig` scenario.
 Y0 = 1963
 
diff --git a/message_ix/tests/test_feature_bound_emission.py b/message_ix/tests/test_feature_bound_emission.py
@@ -1,7 +1,10 @@
+import pytest
 from ixmp import Platform
 
 from message_ix import Scenario
 
+pytestmark = pytest.mark.ixmp4_209
+
 
 def model_setup(scen: Scenario, years: list[int]) -> None:
     scen.add_set("node", "node")
diff --git a/message_ix/tests/test_feature_capacity_factor.py b/message_ix/tests/test_feature_capacity_factor.py
@@ -6,6 +6,8 @@
 from message_ix import ModelError, Scenario
 from message_ix.testing import make_subannual
 
+pytestmark = pytest.mark.ixmp4_209
+
 
 def check_solution(scen: Scenario) -> None:
     """Perform several assertions about the solution of `scen`."""
diff --git a/message_ix/tests/test_feature_duration_time.py b/message_ix/tests/test_feature_duration_time.py
@@ -8,10 +8,13 @@
 
 from itertools import product
 
+import pytest
 from ixmp import Platform
 
 from message_ix import Scenario
 
+pytestmark = pytest.mark.ixmp4_209
+
 
 # A function for generating a simple model with sub-annual time slices
 def model_generator(
diff --git a/message_ix/tests/test_feature_price_commodity.py b/message_ix/tests/test_feature_price_commodity.py
@@ -3,6 +3,8 @@
 
 from message_ix import ModelError, Scenario
 
+pytestmark = pytest.mark.ixmp4_209
+
 
 def model_setup(scen: Scenario, var_cost: int | None = 1) -> None:
     scen.add_set("node", "node")
diff --git a/message_ix/tests/test_feature_price_emission.py b/message_ix/tests/test_feature_price_emission.py
@@ -4,6 +4,8 @@
 
 from message_ix import Scenario, make_df
 
+pytestmark = pytest.mark.ixmp4_209
+
 MODEL = "test_emissions_price"
 
 solve_args = {"equ_list": ["EMISSION_EQUIVALENCE"]}
diff --git a/message_ix/tests/test_feature_storage.py b/message_ix/tests/test_feature_storage.py
@@ -23,6 +23,8 @@
 from message_ix.testing import make_dantzig
 from message_ix.util import expand_dims
 
+pytestmark = pytest.mark.ixmp4_209
+
 
 # A function for generating a simple MESSAGEix model with two technologies
 def model_setup(scen: Scenario, years: list[int]) -> None:
diff --git a/message_ix/tests/test_feature_temporal_level.py b/message_ix/tests/test_feature_temporal_level.py
@@ -15,6 +15,8 @@
 from message_ix import ModelError, Scenario
 from message_ix.testing import make_subannual
 
+pytestmark = pytest.mark.ixmp4_209
+
 # Values for the com_dict argument to make_subannual
 COM_DICT = {
     "gas_ppl": {"input": "fuel", "output": "electr"},
diff --git a/message_ix/tests/test_feature_vintage_and_active_years.py b/message_ix/tests/test_feature_vintage_and_active_years.py
@@ -15,6 +15,9 @@
 # tested here (and not just in ixmp).
 
 
+pytestmark = pytest.mark.ixmp4_209
+
+
 @lru_cache()
 def _generate_yv_ya(periods: tuple[int, ...]) -> pd.DataFrame:
     """All meaningful combinations of (vintage year, active year) given `periods`."""
diff --git a/message_ix/tests/test_macro.py b/message_ix/tests/test_macro.py
@@ -14,6 +14,8 @@
 from message_ix.report import Quantity
 from message_ix.testing import SCENARIO, make_westeros
 
+pytestmark = pytest.mark.ixmp4_209
+
 # NOTE These tests maybe don't need to be parametrized
 # Do the following depend on otherwise untested Scenario functions?
 # Scenario.add_macro()
diff --git a/message_ix/tests/test_message.py b/message_ix/tests/test_message.py
@@ -3,6 +3,7 @@
 from typing import TYPE_CHECKING
 
 import ixmp
+import pytest
 from ixmp.backend.jdbc import JDBCBackend
 
 from message_ix.message import MESSAGE
@@ -11,6 +12,9 @@
     from ixmp import Platform
 
 
+pytestmark = pytest.mark.ixmp4_209
+
+
 class TestMESSAGE:
     """Tests of :class:`.MESSAGE`."""
 
diff --git a/message_ix/tests/test_message_macro.py b/message_ix/tests/test_message_macro.py
@@ -41,6 +41,7 @@ class _MM(MESSAGE_MACRO):
         ):
             _MM()
 
+    @pytest.mark.ixmp4_209
     def test_initialize(self, test_mp: Platform) -> None:
         # MESSAGE_MACRO.initialize() runs
         Scenario(
diff --git a/message_ix/tests/test_report.py b/message_ix/tests/test_report.py
@@ -25,6 +25,8 @@
 from message_ix.report import Reporter, configure
 from message_ix.testing import SCENARIO, make_dantzig, make_westeros
 
+pytestmark = pytest.mark.ixmp4_209
+
 # NOTE These tests maybe don't need to be parametrized.
 # Does `Reporter.from_scenario()` depend on otherwise untested Scenario functions?
 
diff --git a/message_ix/tests/test_testing.py b/message_ix/tests/test_testing.py
@@ -4,6 +4,8 @@
 from message_ix import ModelError, Scenario
 from message_ix.testing import make_austria, make_dantzig, make_westeros
 
+pytestmark = pytest.mark.ixmp4_209
+
 
 @pytest.mark.parametrize(
     "kwargs",
@@ -24,6 +26,7 @@ def test_make_austria(
     assert isinstance(s, Scenario)
 
 
+@pytest.mark.ixmp4_209
 @pytest.mark.parametrize(
     "kwargs",
     (
diff --git a/message_ix/tests/tools/test_sankey.py b/message_ix/tests/tools/test_sankey.py
@@ -11,6 +11,8 @@
 if TYPE_CHECKING:
     import pyam
 
+pytestmark = pytest.mark.ixmp4_209
+
 # NOTE This test likely doesn't need to be parametrized
 
 
diff --git a/message_ix/tests/util/test_gams_io.py b/message_ix/tests/util/test_gams_io.py
@@ -1,14 +1,11 @@
 import pandas as pd
 import pytest
 from ixmp import Platform
-from ixmp.testing import min_ixmp4_version
 
 from message_ix import Scenario
 from message_ix.testing import make_westeros
 from message_ix.util.scenario_data import HELPER_INDEXSETS, HELPER_TABLES
 
-pytestmark = min_ixmp4_version
-
 
 def test_store_message_version() -> None:
     from ixmp.util.ixmp4 import ContainerData
@@ -23,6 +20,7 @@ def test_store_message_version() -> None:
 
 
 @pytest.mark.ixmp4
+@pytest.mark.ixmp4_209
 def test_add_default_data_to_container_data_list(test_mp: Platform) -> None:
     from ixmp.util.ixmp4 import ContainerData
 
@@ -66,6 +64,7 @@ def test_add_default_data_to_container_data_list(test_mp: Platform) -> None:
 
 
 @pytest.mark.ixmp4
+@pytest.mark.ixmp4_209
 def test_add_auxiliary_items_to_container_data_list(
     test_mp: Platform, request: pytest.FixtureRequest
 ) -> None:
diff --git a/message_ix/tests/util/test_tutorial.py b/message_ix/tests/util/test_tutorial.py
@@ -1,5 +1,6 @@
 from typing import TYPE_CHECKING
 
+import pytest
 from ixmp.report import Key
 
 from message_ix import Reporter, Scenario, make_df
@@ -10,6 +11,8 @@
     import pytest
     from ixmp import Platform
 
+pytestmark = pytest.mark.ixmp4_209
+
 
 # NOTE This test likely doesn't need to be parametrized
 def test_prepare_plots(dantzig_reporter: Reporter) -> None:
diff --git a/pyproject.toml b/pyproject.toml
@@ -119,6 +119,7 @@ filterwarnings = [
 ]
 markers = [
   "ixmp4: tests exclusive to IXMP4Backend.",
+  "ixmp4_209: https://github.com/iiasa/ixmp4/pull/209",
   "jdbc: tests exclusive to JDBCBackend.",
   "nightly: Slow-running nightly tests of particular scenarios.",
   "rmessageix: test of the message_ix R interface.",
