Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
218 commits
Select commit Hold shift + click to select a range
d3719f8
Update "transport" CI workflow labels
khaeru Oct 30, 2025
1edfe5e
Handle policy codes in LoadFactorLDV
khaeru Nov 18, 2025
504cd7f
Drop "sha" from message_data workflow dispatch
khaeru Nov 18, 2025
310525e
Add "slurm_remote_args" config setting
khaeru Nov 19, 2025
92004be
Improve .util.slurm and CLI
khaeru Nov 18, 2025
4f25386
Skip logging for mix-models sbatch command
khaeru Nov 22, 2025
2b1a90a
Remove plotnine from packages without type hints
khaeru Nov 18, 2025
aa2a6d0
Add .transport.SLURM_TEMPLATE
khaeru Nov 18, 2025
7235028
Defer jaydebeapi import in .buildings.rc_afofi
khaeru Nov 18, 2025
a141a26
Protect submodule imports in .cli
khaeru Nov 18, 2025
cd9970c
Correct log message in .transport.stock
khaeru Nov 19, 2025
d6b3f57
Set util cache path by default
khaeru Nov 19, 2025
3075f0a
Avoid user_cache_path() in iea_web_data_for_query
khaeru Nov 19, 2025
88dd801
Guard message_data imports in .workflow.solve()
khaeru Nov 19, 2025
2f712aa
Set CPLEX threads=8 for transport solve on UniCC
khaeru Nov 19, 2025
4e10979
Add .report.operator.summarize()
khaeru Nov 21, 2025
53b4b91
Return highest version from .sdmx.read()
khaeru Nov 21, 2025
1cee306
Correct version syntax in PRICE_EMISSION_URL
khaeru Nov 21, 2025
adde325
Add .sdmx.StructureFactory
khaeru Nov 21, 2025
cda2c20
Add .transport.CL_SCENARIO StructureFactory
khaeru Nov 21, 2025
72df8a7
Add IIASA_ECE:CL_TRANSPORT_SCENARIO(1.2.1)
khaeru Nov 21, 2025
55d2705
Add USD / t to transport units
khaeru Nov 22, 2025
a609954
Add transport.policy.*.add_tasks, prepare_computer
khaeru Nov 21, 2025
4e5c089
Assign units in PRICE_EMISSION.add_tasks
khaeru Nov 21, 2025
79b0dd7
Add policy cases to transport…test_debug
khaeru Nov 21, 2025
d9f7472
Add remove_emission_bounds(…, parameters=…) arg
khaeru Nov 21, 2025
b266ed0
Add step_0(…, remove_emission_parameters=…) arg
khaeru Nov 21, 2025
b3f5daa
Remove .transport.workflow.tax_emission()
khaeru Nov 21, 2025
30e7577
Ignore warnings due to iiasa/ixmp4#209
khaeru Nov 22, 2025
02dd856
Add .operator.latest_reporting_from_{file,platform}
khaeru Nov 24, 2025
9d04c8c
Add .report.operator.latest_reporting()
khaeru Nov 24, 2025
005ce7d
Add .transport.plot.MultiStock
khaeru Nov 24, 2025
23f780b
Allow .iamc.to_quantity(…, query=None)
khaeru Nov 24, 2025
9c1723e
Refactor .transport.report.multi()
khaeru Nov 24, 2025
41c055d
Add .util.genno.append()
khaeru Nov 24, 2025
2ef7ecd
Add .transport.plot.Kind enumeration
khaeru Nov 24, 2025
2cd491f
Use .plot.prepare_computer() in {build, report}
khaeru Nov 24, 2025
fe1f61f
Update usage of genno.KeySeq
khaeru Nov 24, 2025
55aad4f
Add .model.workflow.STAGE enumeration
khaeru Nov 26, 2025
fbe8623
Add .types.PlotAddable
khaeru Nov 26, 2025
1ec7078
Add make_output_path(…, config_key=…) argument
khaeru Nov 26, 2025
73e4020
Handle 0 args to .operator.summarize()
khaeru Nov 26, 2025
463fbe8
Improve .report.plot.Plot
khaeru Nov 26, 2025
ea75d30
Use improved .report.plot features in .transport
khaeru Nov 26, 2025
df5dcaf
Add .transport.plot.MultiFE
khaeru Nov 26, 2025
e6ff4c0
Add .transport.key.{debug,demand_base}
khaeru Nov 26, 2025
9098542
Improve .testing.check.CheckResult
khaeru Nov 26, 2025
6962ae1
Add module .transport.check
khaeru Nov 26, 2025
564b04a
Add data/transport/R12/input_cap_new.csv
khaeru Nov 26, 2025
3462a7a
Add .circeular.structure, scenario codelist
khaeru Nov 26, 2025
471d3d5
Relocate short_hash(), add len=… argument
khaeru Dec 10, 2025
b6e535d
Add .testing.check.NoDuplicates
khaeru Dec 10, 2025
b5d197f
Handle kwargs to transport.testing.configure_build
khaeru Dec 10, 2025
a3b7ba9
Retrieve base-model `demand` in transport build
khaeru Dec 10, 2025
92bb3ad
Add .transport.material
khaeru Nov 26, 2025
fcabd22
Test .transport.report.multi()
khaeru Dec 12, 2025
5d4a1e4
Test .transport.build.debug_multi()
khaeru Dec 12, 2025
6206e40
Add .transport.Config.use_modules()
khaeru Dec 14, 2025
d45853b
Add ScenarioInfo.from_path()
khaeru Dec 15, 2025
35df05e
Add "M …" variants to CL_TRANSPORT_SCENARIO
khaeru Dec 14, 2025
08b1056
Add .transport.config.iter_price_emission()
khaeru Dec 15, 2025
c75c54a
Add all available exo prices to transport workflow
khaeru Dec 15, 2025
ee6020a
Add IIASA_ECE:CL_TRANSPORT_SCENARIO(1.3.0)
khaeru Dec 15, 2025
5460662
TEMPORARY Run "transport" workflow for/on branch
khaeru Nov 25, 2025
c60ea92
TEMPORARY Run only SSP2 and DIGSY labels
khaeru Nov 25, 2025
7f63a3a
TEMPORARY Disable "pytest" workflow on branch
khaeru Nov 25, 2025
0688fe4
Temp: fix load factor check
r-aneeque Nov 28, 2025
f027c66
TEMPORARY Use branch for iiasa/message_data#630
khaeru Nov 28, 2025
b87e7ec
Pass 'remote' input to message_data 'transport' CI
khaeru Nov 28, 2025
1387d4e
Temp: Run SSP2 & digsy-best-c only
r-aneeque Nov 28, 2025
b102551
Temp: run SSP2 only
r-aneeque Nov 28, 2025
d10cd88
TEMP: fuel economy for SSP2
r-aneeque Nov 28, 2025
17e8b27
Temp: Run digsy-best-c for CircEUlar
r-aneeque Nov 28, 2025
e0a37cd
Temp: Update DIGSY-BEST-S for sensitivity check
r-aneeque Nov 28, 2025
f97aac0
TEMP: settings for CC_C_D_D
r-aneeque Nov 28, 2025
0928d2e
Temp: ES_C_D_D FE values
r-aneeque Nov 30, 2025
50e4ca6
Correct CPA label//CC_C_D_D
r-aneeque Nov 30, 2025
58ea45c
Run Narrow scenario with CT_C_D_D settings
r-aneeque Nov 30, 2025
4aed893
Update DIGSY-BEST-C file for CircEUlar scenarios
r-aneeque Nov 30, 2025
fd29223
Narrow with CC_C_D_D settings
r-aneeque Nov 30, 2025
54596b4
Experiment: Narrow with ES_C_D_D fuel economy settings
r-aneeque Nov 30, 2025
09291a1
Experimetal: Narrow with _NoS_C_D_D settings
r-aneeque Nov 30, 2025
4f881f1
Experimental: Narrow with _NoS_C_D_D settings
r-aneeque Nov 30, 2025
21c650f
Run SSP2 CircEUlar version
r-aneeque Nov 30, 2025
5f7ade4
Experimental: SSP2 with CT_C_D_D
r-aneeque Nov 30, 2025
c1acebc
Experimental: SSP2 with _CT_C_D_D
r-aneeque Nov 30, 2025
c4df815
Experimental: SSP2 with _ES_C_D_D settings
r-aneeque Nov 30, 2025
72de2b0
Experimental: SSP2 with _NoS_C_D_D
r-aneeque Nov 30, 2025
e728230
run digsy-best-c circeular for Slow
r-aneeque Nov 30, 2025
2760fe3
Experimental: Narrow with _CC_C_D_I settings
r-aneeque Nov 30, 2025
c2f7eee
Experimental: Narrow with _ES_C_D_I
r-aneeque Nov 30, 2025
444bb11
prepare for experimentation
r-aneeque Nov 30, 2025
b1ad237
Update DIGSY-BEST-C for Slow scenarios
r-aneeque Nov 30, 2025
c2e32d4
Update lifetime-ldv for Slow scenarios
r-aneeque Nov 30, 2025
5a91153
Update DIGSY-BEST-C for Slow scenarios
r-aneeque Nov 30, 2025
2f277bc
Update elasticity-f for Slow scenarios
r-aneeque Nov 30, 2025
702ea9c
Experimental: SLOW scenario with _CT_C_D_D settings
r-aneeque Nov 30, 2025
77348a0
Experimental: SLOW scenario with CC_C_D_D
r-aneeque Nov 30, 2025
ea44bcc
Experimental: SLOW scenarios with _ES_C_D_D
r-aneeque Nov 30, 2025
7558b5e
Experimental: SLOW scenario with _NoS_C_D_D settings
r-aneeque Nov 30, 2025
2f62caf
Experimental: SLOW scenario with _CC_C_D_I settings
r-aneeque Nov 30, 2025
f7ddc26
Experimental: SLOW scenario with _CT_C_D_I settings
r-aneeque Nov 30, 2025
e26cacc
Experimental: SLOW scenario with _ES_C_D_I settings
r-aneeque Nov 30, 2025
20a53f4
Experimental: SLOW scenario with _NoS_C_D_I settings
r-aneeque Nov 30, 2025
8997557
Update lifetime-ldv for SLOW scenarios
r-aneeque Dec 1, 2025
b343822
Run SLOW with higher vkt
r-aneeque Dec 1, 2025
fee6a98
Update elasticity-f for NARROW scenarios
r-aneeque Dec 1, 2025
7dcba87
Update DIGSY-BEST-C for NARROW scenarios
r-aneeque Dec 1, 2025
91c0099
Low life for NARROW high-sharing scenarios
r-aneeque Dec 1, 2025
95403e9
Higher vkt/year for NARROW high-sharing scenario
r-aneeque Dec 1, 2025
230157c
Experimental: high load-factor for NARROW high-sharing scenarios
r-aneeque Dec 1, 2025
9a48148
Experimental: Narrow with _CC_C_D_D settings
r-aneeque Dec 1, 2025
b2928ac
Experimental: Narrow with _CT_C_D_D
r-aneeque Dec 1, 2025
ecdee2a
Experimental: Narrow with _ES_C_D_D settings
r-aneeque Dec 1, 2025
75ec27e
Experimental: Narrow with _NoS_C_D_D settings
r-aneeque Dec 1, 2025
d052c5c
Experimental: Narrow with _US_C_D_D settings
r-aneeque Dec 1, 2025
1468c8e
Experimental: Narrow with _CC_C_D_I settings
r-aneeque Dec 1, 2025
10c982f
Experimental: Narrow with _CT_C_D_I settings
r-aneeque Dec 1, 2025
5047c8a
Fix error with _CT_C_D_I
r-aneeque Dec 1, 2025
283eba3
Experimental: Narrow with _ES_C_D_I settings
r-aneeque Dec 1, 2025
e82ceed
Run SSP2 remaining scenarios
r-aneeque Dec 1, 2025
7d5205b
Revert back to SSP2 values
r-aneeque Dec 1, 2025
9a29804
Revert back to model native values
r-aneeque Dec 1, 2025
2d59d9d
Experimental: SSP2 with _ES_C_D_I settings
r-aneeque Dec 1, 2025
ec0ac24
Experimental: SSP2 with _CT_C_D_I settings
r-aneeque Dec 1, 2025
645092a
Experimental: SSP2with _NoS_C_D_I settings
r-aneeque Dec 1, 2025
29b7cdb
Experimental: SSP2 with _US_C_D_I settings
r-aneeque Dec 1, 2025
73d1616
Experimental: SSP2 with _NoS_C_D_I settings
r-aneeque Dec 2, 2025
16cf9ed
Experimental: SSP2 with _ES_C_D_I settings
r-aneeque Dec 2, 2025
78e89a0
Experimental: SSP2 with _CC_C_D_I settings
r-aneeque Dec 2, 2025
860ebb5
Experimental: SSP2 with _CT_C_D_I settings
r-aneeque Dec 2, 2025
0ec3968
Experimental: SSP2 with _US_C_D_I settings
r-aneeque Dec 2, 2025
940f75f
Setup DIGSY-BEST-C for Narrow scenarios
r-aneeque Dec 2, 2025
c0634c9
Setup load-factor for Narrow high-sharing scenarios
r-aneeque Dec 2, 2025
7e6bcb0
Experimental: lifetime-ldv for Narrow high-sharing scenarios
r-aneeque Dec 2, 2025
237bcfe
Experimental: Narrow with _CT_C_D_I settings
r-aneeque Dec 2, 2025
44b5c77
Experimental: Narrow with _CC_C_D_I settings
r-aneeque Dec 2, 2025
b5d4c91
Experimental: Narrow with _ES_C_D_I settings
r-aneeque Dec 2, 2025
bb4e7ad
Experimental: Narrow with _NoS_C_D_I settings
r-aneeque Dec 2, 2025
dfc2e77
Experimental: SLOW with high-sharing
r-aneeque Dec 2, 2025
bdd6df6
Experimental: SLOW settings for high-sharing
r-aneeque Dec 2, 2025
b5d54cb
Experimental: Slow scenarios
r-aneeque Dec 2, 2025
197ac9c
Experimental: setup for SLOW scenarios
r-aneeque Dec 2, 2025
3c1a265
Experimental: Setup SLOW scenarios
r-aneeque Dec 2, 2025
4dead72
Experimental: SLOW with _CC_C_D_I settings
r-aneeque Dec 2, 2025
2e03652
Experimental: Narrow with _CT_C_D_I settings
r-aneeque Dec 2, 2025
d4d0667
Experimental: Narrow with _ES_C_D_I settings
r-aneeque Dec 2, 2025
f223e64
Experimental: Narrow with _US_C_D_I settings
r-aneeque Dec 2, 2025
1577908
Experimental: Slow scenario with medium sharing
r-aneeque Dec 6, 2025
c50a298
Experimental: Fix R12_MEA
r-aneeque Dec 6, 2025
00849d3
Experimental: Slow scenario with medium sharing scenario
r-aneeque Dec 6, 2025
1aadcca
Experimental: Slow with _CC_C_D_I settings
r-aneeque Dec 6, 2025
deb50e0
Experimental: Slow with _CC_C_D_I settings
r-aneeque Dec 6, 2025
8acfc38
Experimental: SLOW with _ES_C_D_I settings
r-aneeque Dec 6, 2025
711e191
Experimental: Slow with _NoS_C_D_I settings
r-aneeque Dec 6, 2025
2b46f03
Experimental: fix 2025 lifetime values
r-aneeque Dec 11, 2025
5be3b20
Experimental: test R12 CHN values
r-aneeque Dec 11, 2025
ce92f08
experimental: fix R12 freight
r-aneeque Dec 11, 2025
1461e20
Experimental: fix R12_CHN values
r-aneeque Dec 11, 2025
f3163f7
Experimental: update ldv new capacity
r-aneeque Dec 11, 2025
fd1bd86
Experimental: Update constraint-dynamic
r-aneeque Dec 11, 2025
a044982
Experimental: R12 CHN fix
r-aneeque Dec 12, 2025
b9f6276
temporary: just for experimentation
r-aneeque Dec 12, 2025
fc58ef6
Revert bank original value
r-aneeque Dec 12, 2025
ce17487
Experimental: change ldv_stock_method == "A"
r-aneeque Dec 12, 2025
1774ad2
Revert ldv new capacity/stock calculation method
r-aneeque Dec 12, 2025
91ba646
experimental: check if SSP2 policy works
r-aneeque Dec 15, 2025
16f7bf2
experimental: run SSP2 values for policy runs
r-aneeque Dec 15, 2025
9430a09
experimental: run SSP2 policy settings
r-aneeque Dec 15, 2025
c8418b9
experimental: run SSP2 policy settings
r-aneeque Dec 15, 2025
e92a7ba
Experimental: add cap_new_lo constraints
r-aneeque Dec 15, 2025
4b9acd8
experimental: constraint-dynamic checks
r-aneeque Dec 16, 2025
be4f9f9
Experimental: add cap_new_lo constraint on BEV & ICEV
r-aneeque Dec 16, 2025
2975fdc
Experimental: High cap-new-lo constraint on ICE
r-aneeque Dec 16, 2025
e923843
Run SSP2 baseline and policy setups
r-aneeque Dec 16, 2025
c28ab47
Experimental: SSP2 with _ES_C_D_I settings
r-aneeque Dec 16, 2025
9c7cfd6
Experimental: ease constraints to check EV uptake response in policy …
r-aneeque Dec 16, 2025
a0ec4c9
fix for Circeular runs
r-aneeque Dec 16, 2025
ee22083
Experimental: SSP2 with _CT_C_D_I settings
r-aneeque Dec 16, 2025
471ef69
Experimental: SSP2 with _NoS_C_D_I settings
r-aneeque Dec 16, 2025
3111061
Experimental: SSP2 with _CC_C_D_I settings
r-aneeque Dec 16, 2025
e337d1c
Experimental: SSP2 with _US_C_D_I settings
r-aneeque Dec 16, 2025
ba044b8
Setup for Narrow scenarios
r-aneeque Dec 16, 2025
0f0f577
pdt values for Narrow scenarios
r-aneeque Dec 16, 2025
0a9d126
Narrow with high sharing scenarios
r-aneeque Dec 16, 2025
a7ef062
Setup for Narrow scenarios
r-aneeque Dec 16, 2025
d47a47b
Setup for Narrow setup for _US_C_D_D scenario
r-aneeque Dec 16, 2025
4041479
Run with NARROW setup for _CC_C_D_D scenario
r-aneeque Dec 16, 2025
9d78e8a
Experimental: Narrow with _ES_C_D_I settings
r-aneeque Dec 16, 2025
d452d10
Experimental: Narrow with _NoS_C_D_I settings
r-aneeque Dec 16, 2025
af981ee
Run Narrow scenarios
r-aneeque Dec 16, 2025
17d1e2c
run policy setup only
r-aneeque Dec 16, 2025
34467b1
add pdt-cap file for policy runs
r-aneeque Dec 16, 2025
de7e9a4
baseline & policy runs
r-aneeque Dec 16, 2025
68ed732
Experimental: Narrow with _CT_C_D_I settings
r-aneeque Dec 16, 2025
07934c4
run Narrow scenario set
r-aneeque Dec 16, 2025
7430323
Experimental: Narrow with _CT_C_D_I settings
r-aneeque Dec 16, 2025
0c44cb2
Experimental: Narrow with _ES_C_D_I settings
r-aneeque Dec 17, 2025
c6a361c
Experimental: Narrow with _NoS_C_D_I settings
r-aneeque Dec 17, 2025
1d1169f
Experimental: Narrow with _US_C_D_I settings
r-aneeque Dec 17, 2025
391ae9c
Experimental: setup for Slow scenarios
r-aneeque Dec 17, 2025
c17a39b
Experimental: Setup for Slow scenarios
r-aneeque Dec 17, 2025
930a940
Experimental: Setup for Slow scenarios
r-aneeque Dec 17, 2025
89cc2d0
Experimental: Setup Slow scenarios
r-aneeque Dec 17, 2025
7a2867b
Experimental: setup for Slow runs
r-aneeque Dec 17, 2025
f11f91b
Experimental: Setup for Slow scenarios
r-aneeque Dec 17, 2025
574eb73
Experimental: Setup slow scenarios with 22k target
r-aneeque Dec 17, 2025
562879f
Experimental: Slow with _CT_C_D_I settings
r-aneeque Dec 17, 2025
e6d32af
Experimental: Slow with _CC_C_D_I settings
r-aneeque Dec 17, 2025
58e0d58
Experimental: SLOW with _ES_C_D_I settings
r-aneeque Dec 17, 2025
d41c2cc
Experimental: SLOW with _NoS_C_D_I settings
r-aneeque Dec 17, 2025
3e01b96
Experimental: Rerun SLOW with _CT_C_D_I settings
r-aneeque Dec 17, 2025
01c58f5
run base digsy-best-c only
r-aneeque Dec 17, 2025
94935ad
Update workflow.py
r-aneeque Dec 17, 2025
a0fce37
Experiment only: run Material enabled Slow scenarios
r-aneeque Dec 17, 2025
9d92483
Run SSP2 Material version
r-aneeque Dec 17, 2025
8215716
Update ldv-inv_cost.csv
r-aneeque Dec 24, 2025
aeec2f4
run SSP2 with different policies
r-aneeque Dec 24, 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
30 changes: 8 additions & 22 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,10 @@ 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"
"SSP2 exo price 2e17",
"SSP2 exo price 4a33",
"SSP2 exo price 5cad"
]

# Currently disabled:
Expand All @@ -53,8 +39,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 +60,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.

7,712 changes: 7,712 additions & 0 deletions message_ix_models/data/sdmx/IIASA_ECE_CL_TRANSPORT_SCENARIO(1.3.0).xml

Large diffs are not rendered by default.

Loading
Loading