Move .transport…ExogenousDataFile to .util.sdmx.Dataflow

- Move and adjust tests.
- Sort entries in .transport.files.
- Add .transport.files.iter_files().
- Add .transport.key.exo, populated using iter_files()
  - Adjust references.

Author: khaeru

message_ix_models/model/transport/build.py

@@ -153,13 +153,14 @@ def add_exogenous_data(c: Computer, info: ScenarioInfo) -> None:
     import message_ix_models.tools.iea.web  # noqa: F401
     from message_ix_models.project.ssp import SSP_2017, SSP_2024
     from message_ix_models.tools.exo_data import prepare_computer
+    from message_ix_models.util.sdmx import Dataflow
 
     # Ensure that the MERtoPPP data provider is available
     from . import (
         data,  # noqa: F401
         key,
     )
-    from .files import FILES, add
+    from .files import iter_files
 
     # Added keys
     keys = {}
@@ -243,15 +244,15 @@ def add_exogenous_data(c: Computer, info: ScenarioInfo) -> None:
     # Data from files
 
     # Identify the mode-share file according to the config setting
-    add(
+    Dataflow(
         key="mode share:n-t:exo",
         path=("mode-share", config.mode_share),
         name="Reference (base year) mode share",
         units="dimensionless",
         replace=True,
     )
 
-    for f in FILES:
+    for _, f in iter_files():
         c.add("", f, context=context)
 
 

message_ix_models/model/transport/demand.py

@@ -13,10 +13,10 @@
 from message_ix_models.report.key import GDP
 from message_ix_models.util import broadcast
 
-from . import files as exo
 from .key import (
     cg,
     cost,
+    exo,
     fv,
     fv_cny,
     gdp_cap,

message_ix_models/model/transport/disutility.py

@@ -2,7 +2,7 @@
 
 from genno import Key, Quantity, quote
 
-from . import files as exo
+from .key import exo
 
 if TYPE_CHECKING:
     from genno import Computer