Transport improvements for 2025-W44

.github/workflows/transport.yaml

@@ -27,15 +27,20 @@ env:
   labels: >-
     [
       "SSP1",
-      "SSP1 policy",
+      "SSP1 exo price",
+      "SSP1 tax",
       "SSP2",
-      "SSP2 policy",
+      "SSP2 exo price",
+      "SSP2 tax",
       "SSP3",
-      "SSP3 policy",
+      "SSP3 exo price",
+      "SSP3 tax",
       "SSP4",
-      "SSP4 policy",
+      "SSP4 exo price",
+      "SSP4 tax",
       "SSP5",
-      "SSP5 policy",
+      "SSP5 exo price",
+      "SSP5 tax",
       "DIGSY-BEST-C",
       "DIGSY-BEST-S",
       "DIGSY-WORST-C",
@@ -75,7 +80,6 @@ jobs:
       run: |
         echo '{
           "ref": "${{ github.ref }}",
-          "sha": "${{ github.sha }}",
           "base": "${{ env.base }}",
           "from-step": "${{ env.from-step }}",
           "labels": ${{ env.labels }}

doc/api/report/index.rst

@@ -201,6 +201,9 @@ Operators
       get_commodity_groups
       get_ts
       gwp_factors
+      latest_reporting
+      latest_reporting_from_platform
+      latest_reporting_from_file
       make_output_path
       model_periods
       node_glb
@@ -209,6 +212,7 @@ Operators
       select_allow_empty
       select_expand
       share_curtailment
+      summarize
       zeros_like
 
    The following functions, defined elsewhere,

doc/api/util.rst

@@ -18,6 +18,7 @@ Submodules:
    pycountry
    scenarioinfo
    sdmx
+   zipfile
 
 Commonly used:
 

doc/transport/input.rst

@@ -133,6 +133,7 @@ Quick links to each of the data flows:
 :data:`~.data.ikarus_var_cost`
 :data:`~.data.input_adj_ldv`
 :data:`~.data.input_base`
+:data:`~.data.input_cap_new`
 :data:`~.data.input_ref_ldv`
 :data:`~.data.input_share`
 :data:`~.data.lifetime_ldv`
@@ -228,6 +229,7 @@ Quick links to each of the data flows:
 .. autodata:: message_ix_models.model.transport.data.ikarus_var_cost
 .. autodata:: message_ix_models.model.transport.data.input_adj_ldv
 .. autodata:: message_ix_models.model.transport.data.input_base
+.. autodata:: message_ix_models.model.transport.data.input_cap_new
 .. autodata:: message_ix_models.model.transport.data.input_ref_ldv
 .. autodata:: message_ix_models.model.transport.data.input_share
 .. autodata:: message_ix_models.model.transport.data.lifetime_ldv

doc/whatsnew.rst

@@ -5,22 +5,86 @@ Next release
 ============
 
 - New provider for exogenous data from the :ref:`tools-cepii` :class:`.BACI` data source (:pull:`450`).
-- Improvements to :class:`.report.Config` (:pull:`178`):
+- New tools and utilities:
+
+  - Enumeration :class:`.workflow.STAGE` (:pull:`447`).
+  - Classes
+    :class:`.sdmx.StructureFactory` and
+    :class:`.testing.check.NoDuplicates` (:pull:`447`).
+  - Method :meth:`.ScenarioInfo.from_path` (:pull:`447`).
+  - Functions :func:`.zipfile.extract_if_newer` (:pull:`450`),
+    :func:`.random_sample_from_file` (:pull:`450`),
+    :func:`~message_ix_models.util.genno.append` (:pull:`447`), and
+    :func:`.iamc.compare` (:pull:`178`).
+
+- Add :py:`parameters` argument  to :func:`.remove_emission_bounds.main` (:pull:`447`),
+  to control which parameter(s) are cleared.
+- Change :py:`query=...` argument to :func:`.iamc.to_quantity`, :func:`.iamc_like_data_for_query` to be optional (:pull:`447`).
+- Improve and extend :mod:`.util.slurm` and :program:`mix-models sbatch` CLI command (:pull:`447`);
+  new class :class:`.slurm.Template`;
+  new configuration setting "slurm remote args".
+
+Reporting
+---------
+
+- Expand :doc:`reporting documentation <api/report/index>` (:pull:`178`)
+  to cover features implemented/not implemented by :mod:`genno`-based reporting.
+  Module globals :data:`.NOT_IMPLEMENTED_MEASURE` and :data:`.NOT_IMPLEMENTED_IAMC`
+  record not-yet-implemented measures and IAMC ‘variables’.
+- Improve :class:`.report.Config` (:pull:`178`):
 
   - New attribute :attr:`~.report.Config.modules`.
   - New method :meth:`~.report.Config.iter_callbacks`.
 
-- New function :func:`.tools.iamc.compare` (:pull:`178`).
 - New module :mod:`.report.extraction` for reporting of resource extraction (:pull:`451`).
-- New reporting operators (:pull:`451`):
-  :func:`.get_commodity_groups`,
-  :func:`.node_glb`, and
-  :func:`.zeros_like`.
-- Expand :doc:`api/report/index` documentation (:pull:`178`)
-  to cover features implemented/not implemented by :mod:`genno`-based reporting.
-  Module globals :data:`.NOT_IMPLEMENTED_MEASURE` and :data:`.NOT_IMPLEMENTED_IAMC`
-  record not-yet-implemented measures and IAMC ‘variables’.
-- New utility functions :func:`.extract_if_newer`, :func:`.random_sample_from_files` (:pull:`450`).
+- New operators:
+
+  - :func:`.get_commodity_groups` (:pull:`451`),
+  - :func:`.latest_reporting` (:pull:`447`),
+  - :func:`.latest_reporting_from_platform` (:pull:`447`),
+  - :func:`.latest_reporting_from_file` (:pull:`447`),
+  - :func:`.node_glb` (:pull:`451`),
+  - :func:`.summarize` (:pull:`447`), and
+  - :func:`.zeros_like` (:pull:`451`).
+
+- Relocate from :mod:`.transport.report.plot` to :mod:`.report.plot` (:pull:`447`)
+  and generalize:
+
+  - Classes :class:`.LabelFirst`, :class:`.PlotTimeSeries`, :class:`.PlotFromIAMC`.
+  - Extensions to the behaviour of :class:`.Plot`.
+- New helper functions :func:`.report.plot.collect`,
+  :func:`.report.plot.prepare_computer` (:pull:`447`).
+
+Projects and model variants
+---------------------------
+
+- Add :doc:`/project/circeular` code list :class:`~.circeular.structure.CL_TRANSPORT_SCENARIO` (:pull:`447`).
+- Improve :mod:`.model.transport` (:pull:`447`).
+
+  - Add :meth:`Config.use_modules <.transport.config.Config.use_modules>`.
+  - Bump Codelist=IIASA_ECE:CL_TRANSPORT_SCENARIO to version 1.3.0.
+
+    - Include model variants with MESSAGEix-Materials
+      by adding and using :attr:`.ScenarioCodeAnnotations.extra_modules`.
+    - Include all available emission price trajectories.
+
+  - New modules:
+
+    - :mod:`.transport.check`
+      with checks and assertions for the build process.
+      These were previously embedded in the test suite.
+    - :mod:`.transport.material`
+      and data flow :data:`.input_cap_new`
+      for integration of MESSAGEix-Transport and -Materials.
+    - :mod:`.transport.slurm` including a :data:`~.transport.slurm.TEMPLATE`.
+
+  - New plots :class:`~.transport.plot.MultiFE`,
+    :class:`~.transport.plot.MultiStock`.
+  - Implement :meth:`.transport.policy.ExogenousEmissionPrice.add_tasks`,
+    :meth:`.TaxEmission.add_tasks`;
+    add :func:`~.transport.policy.prepare_computer`;
+    remove custom code from :func:`.transport.workflow.generate`.
+  - Expand tests.
 
 v2025.10.31
 ===========

message_ix_models/__init__.py

@@ -1,9 +1,23 @@
 import sys
 from importlib.metadata import PackageNotFoundError, version
+from warnings import filterwarnings
 
 import iam_units
 import pint
 
+# This warning is raised because of import message_ix_models.util → import message_ix →
+# import ixmp._config → import ixmp4 → [unclear]. Although recent ixmp and message_ix
+# install the same filter, message_ix_models may be used with older versions of these
+# packages, so for redundancy it is also installed here.
+
+filterwarnings(
+    "ignore",
+    "Core Pydantic V1 functionality isn't compatible with Python 3.14",
+    UserWarning,
+    "fastapi.*",
+)
+# ruff: noqa: E402
+
 from message_ix_models.util._logging import setup as setup_logging
 from message_ix_models.util.config import Config
 from message_ix_models.util.context import Context

message_ix_models/cli.py

@@ -56,15 +56,15 @@ def main(click_ctx, **kwargs):
     mark_time(quiet=True)
 
     # Check for a non-trivial execution of the CLI
-    non_trivial = (
-        not any(s in sys.argv for s in {"config", "last-log", "--help"})
-        and click_ctx.invoked_subcommand != "_test"
-        and "pytest" not in sys.argv[0]
+    needs_log_file = not (
+        "pytest" in sys.argv[0]
+        or "--help" in sys.argv
+        or click_ctx.invoked_subcommand in {"_test", "config", "last-log", "sbatch"}
     )
 
     # Log to console: either DEBUG or INFO.
     # Don't start file logging for a non-trivial execution.
-    setup_logging(level="DEBUG" if kwargs["verbose"] else "INFO", file=non_trivial)
+    setup_logging(level="DEBUG" if kwargs["verbose"] else "INFO", file=needs_log_file)
 
     if "pytest" not in sys.argv[0]:
         log.debug("CLI invoked with:\n" + "\n  ".join(sys.argv))
@@ -203,7 +203,10 @@ def _log_threads(k: int, n: int):
 
 for name in submodules:
     # Import the module and retrieve the click.Command object
-    __import__(name)
+    try:
+        __import__(name)
+    except ImportError as e:
+        print(e)
     cmd = getattr(sys.modules[name], "cli")
 
     # Avoid replacing message-ix-models CLI with message_data CLI