Skip to content

Commit 17f90a1

Browse files
committed
Add #300 to doc/whatsnew
1 parent f0178ba commit 17f90a1

File tree

5 files changed

+49
-14
lines changed

5 files changed

+49
-14
lines changed

doc/api/testing.rst

+8
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,11 @@ Others:
3030

3131
.. automodule:: message_ix_models.testing
3232
:members:
33+
34+
.. currentmodule:: message_ix_models.testing.check
35+
36+
Checks
37+
======
38+
39+
.. automodule:: message_ix_models.testing.check
40+
:members:

doc/whatsnew.rst

+37-8
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,27 @@ Next release
1010
- Support for :mod:`ixmp` and :mod:`message_ix` versions 3.4, 3.5, and 3.6 is dropped (:pull:`288`, :pull:`289`).
1111
The minimum supported version of both packages is 3.7.0.
1212

13-
- Update :class:`.IEA_EWEB` to support :py:`transform="B"` / :func:`.transform_B` (:issue:`230`, :pull:`259`).
14-
15-
- New utility :class:`.sdmx.AnnotationsMixIn` (:pull:`259`).
13+
- Update :class:`.IEA_EWEB` to support:
14+
15+
- :py:`transform="B"` / :func:`.transform_B` (:issue:`230`, :pull:`259`).
16+
- :py:`transform="C"` / :func:`.transform_C` (:issue:`229`, :pull:`300`).
17+
- The :class:`~.web.TRANSFORM` enumeration for specifying and validating multiple transformations.
18+
19+
- New class :class:`.Dataflow` for describing input and/or output data flows (:pull:`300`) that are read from file and attached to a :class:`.Computer`.
20+
Generalized from former :py:`.transport.files.ExogenousDataFile`.
21+
- New method :meth:`.Config.regions_from_scenario` (:pull:`300`),
22+
extracted/generalized from :meth:`.transport.Config.from_context`.
23+
- New general-purpose :mod:`genno` operators in :mod:`.report.operator`: :func:`.broadcast_wildcard` and :func:`.merge_data` (:pull:`300`),
24+
extracted/generalized from :mod:`.transport.operator`.
25+
- New utilities:
26+
27+
- :class:`.genno.Collector` (:pull:`300`).
28+
- :class:`.sdmx.AnnotationsMixIn` (:pull:`259`).
29+
- :func:`.check.verbose_check` (:pull:`300`).
30+
31+
- Display entire result quantity in :func:`.report.report` / :program:`mix-models report` with :py:`verbose=True` (:pull:`300`).
32+
- Bug fix: :program:`mix-models --verbose` command-line option was not stored on :class:`.Context`/:class:`~.util.Config` (:pull:`300`).
33+
- Bug fix: adjust or guard some Python usage that was not compatible with Python 3.9—the earliest version supported by :mod:`message_ix_models` (:pull:`295`, :issue:`294`).
1634
- Drop obsolete :py:`series_of_pint_quantity()` (:pull:`289`).
1735

1836
By topic:
@@ -33,20 +51,34 @@ Improve :mod:`.ssp.transport`:
3351
Transport
3452
---------
3553

36-
Update :doc:`/transport/index` (:pull:`259`, :pull:`289`).
54+
Update :doc:`/transport/index` (:pull:`259`, :pull:`289`, :pull:`300`).
3755

3856
- Adjust constraints on :py:`t="conm_ar"`.
39-
- Recompute :attr:`.minimum_activity` for transport technologies.
57+
- Drop some :attr:`.minimum_activity` entries; recompute values and add to :data:`.act_non_ldv`.
4058
- Improve freight representation:
4159

4260
- Adjust freight activity, freight and passenger mode shares for some regions.
4361
- Add dynamic constraints on activity of freight technologies.
4462
- Fix alignment of freight technology outputs with demand |l|.
63+
- Add :data:`.elasticity_f`, analogous to :data:`.elasticity_p`.
64+
See :func:`.freight.demand`.
4565

4666
- Implement LED override using exogenous passenger activity data from :ref:`transport-pdt-cap-proj`.
67+
- Update input data for :data:`.elasticity_p`, :data:`ikarus_inv_cost`, :data:`.inv_cost_ldv`, :data:`.mode_share_freight`, :data:`.pdt_cap_ref`, :data:`.speed`, .
68+
- Add LED-specific parametrization for :data:`.activity_ldv`, :data:`lifetime_ldv`, :data:`.load_factor_ldv`, :data:`pdt_cap_proj`, .
4769
- Drop :file:`base-scenario-url.json`; store base scenario URLs in :ref:`CL_TRANSPORT_SCENARIO`.
4870
- Generate SDMX-ML structural metadata, including data flow definitions, and SDMX-{CSV,ML} data outputs for certain reported quantities.
71+
72+
- New input data flow :data:`.input_share`.
73+
- Add :py:`scenario` dimension to :data:`.activity_ldv`, :data:`.lifetime_ldv`, input data flow and files.
4974
- Expand use of fixed/shared keys from :mod:`.transport.key`.
75+
- Improve documentation:
76+
77+
- Expand documentation of :doc:`input data flows <transport/input>` to include *all* input data flows.
78+
- Document some :doc:`output data flows <transport/output>`.
79+
- New operator :func:`.indexer_scenario`.
80+
- New plot :class:`.Scale1Diff`.
81+
- Simplify signature of :func:`.transport.build.main`, :func:`.transport.build.get_computer`.
5082
- Simplify and consolidate tests.
5183
- Improve :func:`.simulated_solution` to load ‘simulated’ solution data from file to reduce test durations.
5284

@@ -72,9 +104,6 @@ Documentation
72104
:doc:`project/sparccle`, and
73105
:doc:`project/uptake` (:pull:`282`).
74106

75-
- New utility :class:`.sdmx.AnnotationsMixIn` (:pull:`259`).
76-
- Bug fix: adjust or guard some Python usage that was not compatible with Python 3.9—the earliest version supported by :mod:`message_ix_models` (:pull:`295`, :issue:`294`).
77-
78107
v2025.1.10
79108
==========
80109

message_ix_models/model/transport/demand.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
t_modes,
3535
y,
3636
)
37+
from .util import EXTRAPOLATE
3738

3839
if TYPE_CHECKING:
3940
from genno import Computer
@@ -43,8 +44,6 @@
4344

4445
log = logging.getLogger(__name__)
4546

46-
EXTRAPOLATE = dict(kwargs=dict(fill_value="extrapolate"))
47-
4847

4948
def dummy(
5049
commodities: list, nodes: list[str], y: list[int], config: dict

message_ix_models/tools/iea/web.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ def transform_C(qty: "TQuantity") -> "TQuantity":
576576
:py:`flow="_1"` and :py:`flow="_2"` such that:
577577
578578
.. math::
579-
X_{\_1} = X_{DOMESAIR} - X_{AVBUNK}
579+
X_{\_1} = X_{DOMESAIR} - X_{AVBUNK} \\
580580
X_{\_2} = X_{TOTTRANS} - X_{AVBUNK}
581581
582582
The resulting values for, for instance, :math:`X_{\_1}` are larger in magnitude than

message_ix_models/util/sdmx.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,10 @@ class Dataflow:
9292
If an input data flow, the data is expected in a file at `path`.
9393
9494
.. todo::
95-
- Accept an argument that sets :attr:`dfd` directly; skip handling other
96-
arguments.
95+
- Accept an argument that sets :attr:`df` directly and ignores other arguments.
9796
- Annotate certain dimensions as optional; expand :meth:`.add_tasks` to
9897
automatically handle insertion of these dimensions.
99-
- Merge with, or make a subclass of, :class:`.ExoData`.
98+
- Merge with :class:`.ExoDataSource`.
10099
101100
Parameters
102101
----------

0 commit comments

Comments
 (0)