Skip to content

Commit 37a5469

Browse files
committed
Adjust for iam-units 2025-10-13
- Call iam_units.configure_currency() at the top level. The default was deprecated in iam-units and in 2025-10-13 is no longer present. - Ignore one type error, to be fixed upstream.
1 parent 09eafed commit 37a5469

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

message_ix_models/__init__.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import sys
22
from importlib.metadata import PackageNotFoundError, version
33

4+
import iam_units
45
import pint
5-
from iam_units import registry
66

77
from message_ix_models.util._logging import setup as setup_logging
88
from message_ix_models.util.config import Config
@@ -24,7 +24,8 @@
2424
setup_logging(console=False, file=False)
2525

2626
# Use iam_units.registry as the default pint.UnitsRegistry
27-
pint.set_application_registry(registry)
27+
iam_units.configure_currency("EXC", "2005")
28+
pint.set_application_registry(iam_units.registry)
2829

2930
# Ensure at least one Context instance is created
3031
Context()

message_ix_models/model/emissions.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,10 @@ def get_emission_factors(units: Optional[str] = None) -> "AnyQuantity":
135135
# Identify a GWP factor for target `units`, if any
136136
to_units, to_species = split_species(units)
137137
gwp_factor = convert_gwp(
138-
"AR5GWP100", (1.0, str(result.units)), "C", to_species
138+
"AR5GWP100",
139+
(1.0, str(result.units)),
140+
"C",
141+
to_species, # type: ignore [arg-type]
139142
).magnitude
140143
else:
141144
gwp_factor, to_units = 1.0, result.units

0 commit comments

Comments
 (0)