Merge pull request #453 from iiasa/ci/macos-13

Swap macos-13 → -15-intel runners in CI

Author: khaeru

.github/workflows/pytest.yaml

@@ -52,7 +52,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ macos-13, macos-latest, ubuntu-latest, windows-latest ]
+        os: [ macos-15-intel, macos-latest, ubuntu-latest, windows-latest ]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: francisbilham11/action-cached-lfs-checkout@v3
@@ -88,7 +88,7 @@ jobs:
     strategy:
       matrix:
         os:
-        - macos-13
+        - macos-15-intel
         - macos-latest
         - ubuntu-latest
         - windows-latest
@@ -99,7 +99,7 @@ jobs:
         # Minimum version given in pyproject.toml + earlier version of Python
         # For this job only, the oldest version of Python supported by message-ix-models
         - { upstream: v3.8.0,  python: "3.10"  }  # Released 2024-01-12
-        - { upstream: v3.9.0,  python: "3.14" }  # 2024-06-04
+        - { upstream: v3.9.0,  python: "3.13" }  # 2024-06-04
         - { upstream: v3.10.0, python: "3.14" }  # 2025-02-21
         # Latest released version + latest released Python
         - { upstream: v3.11.0, python: "3.14" }  # 2025-05-27
@@ -112,9 +112,9 @@ jobs:
         - { os: macos-latest, version: { upstream: v3.8.0 }}
         - { os: macos-latest, version: { upstream: v3.9.0 }}
         # Redundant with macos-latest
-        - { os: macos-13, version: { upstream: v3.10.0 }}
-        - { os: macos-13, version: { upstream: v3.11.0 }}
-        - { os: macos-13, version: { upstream: main }}
+        - { os: macos-15-intel, version: { upstream: v3.10.0 }}
+        - { os: macos-15-intel, version: { upstream: v3.11.0 }}
+        - { os: macos-15-intel, version: { upstream: main }}
 
       fail-fast: false
 
@@ -153,8 +153,6 @@ jobs:
         license: ${{ secrets.GAMS_LICENSE }}
 
     - uses: ts-graphviz/setup-graphviz@v2
-      # Work around ts-graphviz/setup-graphviz#630
-      if: matrix.os != 'macos-13'
 
     - name: Set Java version on Windows
       if: startsWith(matrix.os, 'windows-')

message_ix_models/model/transport/testing.py

@@ -1,7 +1,6 @@
 """Utilities for testing :mod:`~message_ix_models.model.transport`."""
 
 import logging
-import platform
 from collections import ChainMap
 from collections.abc import Callable, Hashable, Mapping
 from contextlib import nullcontext
@@ -18,7 +17,6 @@
 from message_ix_models.report.sim import add_simulated_solution
 from message_ix_models.testing import GHA, SOLVE_OPTIONS, bare_res
 from message_ix_models.util import silence_log
-from message_ix_models.util.graphviz import HAS_GRAPHVIZ
 
 from . import Config, build
 
@@ -47,10 +45,6 @@
             reason="Missing ISR/mer-to-ppp.csv + not supported by MaybeAdaptR11Source",
         ),
         4: pytest.mark.xfail(reason="Currently unsupported"),
-        7: pytest.mark.xfail(
-            condition=GHA and platform.system() == "Darwin" and not HAS_GRAPHVIZ,
-            reason="Graphviz missing on macos-13 GitHub Actions runners",
-        ),
         9: pytest.mark.xfail(reason="Missing R14 input data/config"),
         10: pytest.mark.usefixtures(
             "advance_test_data", "iea_eweb_test_data", "ssp_user_data"

message_ix_models/testing/__init__.py

@@ -6,7 +6,6 @@
     from base64 import b32hexencode as b32encode
 except ImportError:
     from base64 import b32encode
-import platform
 from collections.abc import Generator, Hashable
 from copy import deepcopy
 from importlib.metadata import version
@@ -68,12 +67,6 @@
         condition=GHA,
         reason="GitHub-hosted runner has no access to IIASA-internal databases",
     ),
-    1: pytest.mark.xfail(
-        condition=GHA
-        and platform.system() == "Darwin"
-        and not bool(shutil.which("dot")),
-        reason="Graphviz not available for GitHub Actions jobs on some macOS runners",
-    ),
     2: pytest.mark.xfail(
         condition=not util.HAS_MESSAGE_DATA,
         reason="Not yet migrated from message_data",

message_ix_models/tests/model/transport/test_build.py

@@ -283,7 +283,6 @@ def scenario_code() -> Iterator["Code"]:
 
 
 @MARK[10]
-@MARK[7]
 @build.get_computer.minimum_version
 @pytest.mark.parametrize(
     "regions, years, dummy_LDV, nonldv, solve",

message_ix_models/tests/model/transport/test_demand.py

@@ -97,7 +97,6 @@ def test_exo_pdt(test_context, ssp, regions="R12", years="B"):
     )
 
 
-@MARK[7]
 @build.get_computer.minimum_version
 def test_exo_report(test_context, tmp_path):
     """Exogenous demand results can be plotted.
@@ -228,7 +227,6 @@ def test_urban_rural_shares(test_context, tmp_path, regions, years, pop_scen):
 
 
 @MARK["#375"]
-@MARK[7]
 @build.get_computer.minimum_version
 @workflow.generate.minimum_version
 @pytest.mark.parametrize(

message_ix_models/tests/model/transport/test_report.py

@@ -132,7 +132,6 @@ def test_debug(
 
 
 @MARK[10]
-@MARK[7]
 @build.get_computer.minimum_version
 @pytest.mark.parametrize(
     "regions, years",
@@ -187,7 +186,6 @@ def test_bare(
 
 @build.get_computer.minimum_version
 @MARK[10]
-@MARK[7]
 @mark.usefixtures("quiet_genno")
 @mark.parametrize(
     "build",

message_ix_models/tests/project/test_navigate.py

@@ -64,7 +64,6 @@ def test_generate_workflow(test_context: "Context") -> None:
 ]
 
 
-@testing.MARK[1]
 def test_generate_workflow_cli(test_context, mix_models_cli) -> None:
     """Test :func:`.navigate.workflow.generate` and associated CLI."""
 

message_ix_models/tests/test_workflow.py

@@ -5,7 +5,6 @@
 from message_ix import make_df
 
 from message_ix_models import Workflow, testing
-from message_ix_models.testing import MARK
 from message_ix_models.workflow import WorkflowStep, make_click_command, solve
 
 if TYPE_CHECKING:
@@ -92,7 +91,6 @@ def _wf(
     return wf
 
 
-@MARK[1]
 def test_make_click_command(
     request: "pytest.FixtureRequest", mix_models_cli: "CliRunner"
 ) -> None: