Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
92be710
Update "transport" CI workflow labels
khaeru Oct 30, 2025
b49b656
Handle policy codes in LoadFactorLDV
khaeru Nov 18, 2025
e5228c1
Drop "sha" from message_data workflow dispatch
khaeru Nov 18, 2025
dac79cc
Add "slurm_remote_args" config setting
khaeru Nov 19, 2025
fc34a06
Improve .util.slurm and CLI
khaeru Nov 18, 2025
1479359
Skip logging for mix-models sbatch command
khaeru Nov 22, 2025
850611c
Remove plotnine from packages without type hints
khaeru Nov 18, 2025
55dae8b
Add .transport.SLURM_TEMPLATE
khaeru Nov 18, 2025
52af2e2
Defer jaydebeapi import in .buildings.rc_afofi
khaeru Nov 18, 2025
76d93cc
Protect submodule imports in .cli
khaeru Nov 18, 2025
44f0ba7
Correct log message in .transport.stock
khaeru Nov 19, 2025
742867b
Set util cache path by default
khaeru Nov 19, 2025
57074bf
Avoid user_cache_path() in iea_web_data_for_query
khaeru Nov 19, 2025
431a6b4
Guard message_data imports in .workflow.solve()
khaeru Nov 19, 2025
73bd162
Set CPLEX threads=8 for transport solve on UniCC
khaeru Nov 19, 2025
40cab34
Add .report.operator.summarize()
khaeru Nov 21, 2025
2a50a3c
Return highest version from .sdmx.read()
khaeru Nov 21, 2025
71d7fb7
Correct version syntax in PRICE_EMISSION_URL
khaeru Nov 21, 2025
da1289f
Add .sdmx.StructureFactory
khaeru Nov 21, 2025
467df38
Add .transport.CL_SCENARIO StructureFactory
khaeru Nov 21, 2025
785fb4d
Add IIASA_ECE:CL_TRANSPORT_SCENARIO(1.2.1)
khaeru Nov 21, 2025
ff3cd3a
Add USD / t to transport units
khaeru Nov 22, 2025
0b29e67
Add transport.policy.*.add_tasks, prepare_computer
khaeru Nov 21, 2025
5aa43b8
Assign units in PRICE_EMISSION.add_tasks
khaeru Nov 21, 2025
b220723
Add policy cases to transport…test_debug
khaeru Nov 21, 2025
5b77421
Add remove_emission_bounds(…, parameters=…) arg
khaeru Nov 21, 2025
6cf2283
Add step_0(…, remove_emission_parameters=…) arg
khaeru Nov 21, 2025
7969276
Remove .transport.workflow.tax_emission()
khaeru Nov 21, 2025
f55ccee
Ignore warnings due to iiasa/ixmp4#209
khaeru Nov 22, 2025
780aca6
Add .operator.latest_reporting_from_{file,platform}
khaeru Nov 24, 2025
3f5bf54
Add .report.operator.latest_reporting()
khaeru Nov 24, 2025
b25c1d1
Add .transport.plot.MultiStock
khaeru Nov 24, 2025
0033db9
Allow .iamc.to_quantity(…, query=None)
khaeru Nov 24, 2025
5ab4682
Refactor .transport.report.multi()
khaeru Nov 24, 2025
27fa182
Add .util.genno.append()
khaeru Nov 24, 2025
b72c616
Add .transport.plot.Kind enumeration
khaeru Nov 24, 2025
eecc040
Use .plot.prepare_computer() in .transport.build
khaeru Nov 24, 2025
ecde703
Update usage of genno.KeySeq
khaeru Nov 24, 2025
5ad20e2
TEMPORARY Run "transport" workflow for/on branch
khaeru Nov 25, 2025
df1ad4e
TEMPORARY Run only SSP2 and DIGSY labels
khaeru Nov 25, 2025
d682ff7
TEMPORARY Disable "pytest" workflow on branch
khaeru Nov 25, 2025
d7e8787
Temp: fix load factor check
r-aneeque Nov 28, 2025
aa4d683
TEMPORARY Use branch for iiasa/message_data#630
khaeru Nov 28, 2025
a5349bb
Pass 'remote' input to message_data 'transport' CI
khaeru Nov 28, 2025
d1b70f8
Temp: Run SSP2 & digsy-best-c only
r-aneeque Nov 28, 2025
aa8160c
Temp: run SSP2 only
r-aneeque Nov 28, 2025
539997a
TEMP: fuel economy for SSP2
r-aneeque Nov 28, 2025
9ff556d
Temp: Run digsy-best-c for CircEUlar
r-aneeque Nov 28, 2025
57d0fd1
Temp: Update DIGSY-BEST-S for sensitivity check
r-aneeque Nov 28, 2025
70a5663
TEMP: settings for CC_C_D_D
r-aneeque Nov 28, 2025
baa6987
Temp: ES_C_D_D FE values
r-aneeque Nov 30, 2025
b5fae40
Correct CPA label//CC_C_D_D
r-aneeque Nov 30, 2025
0f39cea
Run Narrow scenario with CT_C_D_D settings
r-aneeque Nov 30, 2025
495597f
Update DIGSY-BEST-C file for CircEUlar scenarios
r-aneeque Nov 30, 2025
cac1f70
Narrow with CC_C_D_D settings
r-aneeque Nov 30, 2025
1c9d060
Experiment: Narrow with ES_C_D_D fuel economy settings
r-aneeque Nov 30, 2025
d1d4f81
Experimetal: Narrow with _NoS_C_D_D settings
r-aneeque Nov 30, 2025
be12c96
Experimental: Narrow with _NoS_C_D_D settings
r-aneeque Nov 30, 2025
a7d7eb6
Run SSP2 CircEUlar version
r-aneeque Nov 30, 2025
ed4d3de
Experimental: SSP2 with CT_C_D_D
r-aneeque Nov 30, 2025
b0756a9
Experimental: SSP2 with _CT_C_D_D
r-aneeque Nov 30, 2025
6b491b5
Experimental: SSP2 with _ES_C_D_D settings
r-aneeque Nov 30, 2025
b0f9e4e
Experimental: SSP2 with _NoS_C_D_D
r-aneeque Nov 30, 2025
43c0d0c
run digsy-best-c circeular for Slow
r-aneeque Nov 30, 2025
6cc5984
Experimental: Narrow with _CC_C_D_I settings
r-aneeque Nov 30, 2025
d45a13d
Experimental: Narrow with _ES_C_D_I
r-aneeque Nov 30, 2025
946d734
prepare for experimentation
r-aneeque Nov 30, 2025
b990919
Update DIGSY-BEST-C for Slow scenarios
r-aneeque Nov 30, 2025
f0d808f
Update lifetime-ldv for Slow scenarios
r-aneeque Nov 30, 2025
6218f88
Update DIGSY-BEST-C for Slow scenarios
r-aneeque Nov 30, 2025
21c7d52
Update elasticity-f for Slow scenarios
r-aneeque Nov 30, 2025
96443d1
Experimental: SLOW scenario with _CT_C_D_D settings
r-aneeque Nov 30, 2025
a2dc1c7
Experimental: SLOW scenario with CC_C_D_D
r-aneeque Nov 30, 2025
3ce931d
Experimental: SLOW scenarios with _ES_C_D_D
r-aneeque Nov 30, 2025
8ab0e40
Experimental: SLOW scenario with _NoS_C_D_D settings
r-aneeque Nov 30, 2025
a1a552a
Experimental: SLOW scenario with _CC_C_D_I settings
r-aneeque Nov 30, 2025
8bc32c5
Experimental: SLOW scenario with _CT_C_D_I settings
r-aneeque Nov 30, 2025
876b8d0
Experimental: SLOW scenario with _ES_C_D_I settings
r-aneeque Nov 30, 2025
b336dae
Experimental: SLOW scenario with _NoS_C_D_I settings
r-aneeque Nov 30, 2025
508ae01
Update lifetime-ldv for SLOW scenarios
r-aneeque Dec 1, 2025
ced9699
Run SLOW with higher vkt
r-aneeque Dec 1, 2025
3bcf8ff
Update elasticity-f for NARROW scenarios
r-aneeque Dec 1, 2025
91fb1d1
Update DIGSY-BEST-C for NARROW scenarios
r-aneeque Dec 1, 2025
5481ad3
Low life for NARROW high-sharing scenarios
r-aneeque Dec 1, 2025
03beb9f
Higher vkt/year for NARROW high-sharing scenario
r-aneeque Dec 1, 2025
30fc280
Experimental: high load-factor for NARROW high-sharing scenarios
r-aneeque Dec 1, 2025
79f18bd
Experimental: Narrow with _CC_C_D_D settings
r-aneeque Dec 1, 2025
b22d359
Experimental: Narrow with _CT_C_D_D
r-aneeque Dec 1, 2025
baccc75
Experimental: Narrow with _ES_C_D_D settings
r-aneeque Dec 1, 2025
ca79451
Experimental: Narrow with _NoS_C_D_D settings
r-aneeque Dec 1, 2025
c56423b
Experimental: Narrow with _US_C_D_D settings
r-aneeque Dec 1, 2025
c806608
Experimental: Narrow with _CC_C_D_I settings
r-aneeque Dec 1, 2025
eb937a2
Experimental: Narrow with _CT_C_D_I settings
r-aneeque Dec 1, 2025
5cfcf26
Fix error with _CT_C_D_I
r-aneeque Dec 1, 2025
6d8c205
Experimental: Narrow with _ES_C_D_I settings
r-aneeque Dec 1, 2025
8b6508e
Run SSP2 remaining scenarios
r-aneeque Dec 1, 2025
b9df413
Revert back to SSP2 values
r-aneeque Dec 1, 2025
62a42e8
Revert back to model native values
r-aneeque Dec 1, 2025
1ff93ad
Experimental: SSP2 with _ES_C_D_I settings
r-aneeque Dec 1, 2025
1fb9e97
Experimental: SSP2 with _CT_C_D_I settings
r-aneeque Dec 1, 2025
f613e32
Experimental: SSP2with _NoS_C_D_I settings
r-aneeque Dec 1, 2025
38ce34d
Experimental: SSP2 with _US_C_D_I settings
r-aneeque Dec 1, 2025
7e5f297
Experimental: SSP2 with _NoS_C_D_I settings
r-aneeque Dec 2, 2025
5602258
Experimental: SSP2 with _ES_C_D_I settings
r-aneeque Dec 2, 2025
ed1178b
Experimental: SSP2 with _CC_C_D_I settings
r-aneeque Dec 2, 2025
772fc8a
Experimental: SSP2 with _CT_C_D_I settings
r-aneeque Dec 2, 2025
d76e301
Experimental: SSP2 with _US_C_D_I settings
r-aneeque Dec 2, 2025
9406a56
Setup DIGSY-BEST-C for Narrow scenarios
r-aneeque Dec 2, 2025
412d83e
Setup load-factor for Narrow high-sharing scenarios
r-aneeque Dec 2, 2025
393f10c
Experimental: lifetime-ldv for Narrow high-sharing scenarios
r-aneeque Dec 2, 2025
784e345
Experimental: Narrow with _CT_C_D_I settings
r-aneeque Dec 2, 2025
0ac3316
Experimental: Narrow with _CC_C_D_I settings
r-aneeque Dec 2, 2025
fce5866
Experimental: Narrow with _ES_C_D_I settings
r-aneeque Dec 2, 2025
33af6a6
Experimental: Narrow with _NoS_C_D_I settings
r-aneeque Dec 2, 2025
58cd063
Experimental: SLOW with high-sharing
r-aneeque Dec 2, 2025
af78e4a
Experimental: SLOW settings for high-sharing
r-aneeque Dec 2, 2025
a8c6cd7
Experimental: Slow scenarios
r-aneeque Dec 2, 2025
076b656
Experimental: setup for SLOW scenarios
r-aneeque Dec 2, 2025
b0ccb8f
Experimental: Setup SLOW scenarios
r-aneeque Dec 2, 2025
b914616
Experimental: SLOW with _CC_C_D_I settings
r-aneeque Dec 2, 2025
af5ecf4
Experimental: Narrow with _CT_C_D_I settings
r-aneeque Dec 2, 2025
683fc7f
Experimental: Narrow with _ES_C_D_I settings
r-aneeque Dec 2, 2025
dea7f8d
Experimental: Narrow with _US_C_D_I settings
r-aneeque Dec 2, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/pytest.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: Test

on:
on: {}
# To debug the workflow, uncomment this entry AND comment pull_request_target
# pull_request:
# branches: [ main ]
pull_request_target:
branches: [ main, "migrate**" ]
types: [ labeled, opened, reopened, synchronize ]
schedule:
- cron: "0 5 * * *" # = 06:00 CET = 07:00 CEST
# pull_request_target:
# branches: [ main, "migrate**" ]
# types: [ labeled, opened, reopened, synchronize ]
# schedule:
# - cron: "0 5 * * *" # = 06:00 CET = 07:00 CEST

# Cancel previous runs that have not completed
concurrency:
Expand Down
29 changes: 6 additions & 23 deletions .github/workflows/transport.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: MESSAGEix-Transport
env:
# The repository, ref (branch), and workflow file name to dispatch
target-repo: iiasa/message_data
target-ref: dev
target-ref: ci/git-clone-remote
target-workflow: transport

# Starting point of the workflow.
Expand All @@ -26,24 +26,7 @@ env:
# - Ensure there is NO trailing comma on the last line.
labels: >-
[
"SSP1",
"SSP1 policy",
"SSP2",
"SSP2 policy",
"SSP3",
"SSP3 policy",
"SSP4",
"SSP4 policy",
"SSP5",
"SSP5 policy",
"DIGSY-BEST-C",
"DIGSY-BEST-S",
"DIGSY-WORST-C",
"DIGSY-WORST-S",
"EDITS-CA",
"EDITS-HA",
"LED-SSP1",
"LED-SSP2"
"DIGSY-BEST-C"
]

# Currently disabled:
Expand All @@ -53,8 +36,8 @@ env:

on:
# Uncomment these lines for debugging, but leave them commented on 'main'
# pull_request:
# branches: [ main ]
pull_request:
branches: [ main ]
# push:
# branches: [ main ]
schedule:
Expand All @@ -74,8 +57,8 @@ jobs:
- name: Assemble JSON payload
run: |
echo '{
"ref": "${{ github.ref }}",
"sha": "${{ github.sha }}",
"ref": "project/circeular/2025-w48",
"remote": "https://github.com/iiasa/message-ix-models.git",
"base": "${{ env.base }}",
"from-step": "${{ env.from-step }}",
"labels": ${{ env.labels }}
Expand Down
1 change: 1 addition & 0 deletions doc/api/report/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ Operators
select_allow_empty
select_expand
share_curtailment
summarize
zeros_like

The following functions, defined elsewhere,
Expand Down
14 changes: 14 additions & 0 deletions message_ix_models/__init__.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
15 changes: 9 additions & 6 deletions message_ix_models/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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
Expand Down
545 changes: 545 additions & 0 deletions message_ix_models/data/sdmx/IIASA_ECE_CL_TRANSPORT_SCENARIO(1.2.1).xml

Large diffs are not rendered by default.

Loading
Loading