Remove .projects.shape, .tools.{gea,iea_eei}

migrated and improved in #162

message_ix_models/model/transport/operator.py

@@ -41,7 +41,6 @@
 from sdmx.model.v21 import Code
 
 from message_data.projects.navigate import T35_POLICY
-from message_data.tools import iea_eei
 
 from .config import Config
 
@@ -271,6 +270,8 @@ def distance_ldv(config: dict) -> "AnyQuantity":
 def distance_nonldv(config: dict) -> "AnyQuantity":
     """Return annual travel distance per vehicle for non-LDV transport modes."""
     # Load from IEA EEI
+    from message_data.tools import iea_eei  # type: ignore [attr-defined]
+
     dfs = iea_eei.get_eei_data(config["regions"])
     df = (
         dfs["vehicle use"]
@@ -607,6 +608,8 @@ def merge_data(
 
 def iea_eei_fv(name: str, config: Dict) -> "AnyQuantity":
     """Returns base-year demand for freight from IEA EEI, with dimensions n-c-y."""
+    from message_data.tools import iea_eei  # type: ignore [attr-defined]
+
     result = iea_eei.as_quantity(name, config["regions"])
     ym1 = result.coords["y"].data[-1]
 

message_ix_models/model/transport/roadmap.py

@@ -18,8 +18,6 @@
 from message_ix_models.util import private_data_path
 from plotnine import save_as_pdf_pages
 
-from message_data.tools.iea_eei import plot_params_per_mode
-
 #: Name of the file containing the data.
 FILE = "RoadmapResults_2017.xlsx"
 
@@ -168,7 +166,7 @@ def get_roadmap_data(context, region=("Africa", "R11_AFR"), years=None, plot=Fal
         debug_path.mkdir(parents=True, exist_ok=True)
         # Plot all indicators as grid, per mode, and store them into PNG images
         save_as_pdf_pages(
-            plot_params_per_mode(df),
+            # plot_params_per_mode(df),  # TODO Convert to use genno.core.plotnine.Plot
             filename=f"{context.model.regions}_AFR_Indicators_per_mode.pdf",
             path=debug_path,
         )

message_ix_models/tests/model/transport/test_operator.py

@@ -12,7 +12,6 @@
     distance_nonldv,
     factor_input,
     factor_ssp,
-    iea_eei_fv,
     pdt_per_capita,
     transport_check,
 )
@@ -133,13 +132,6 @@ def test_factor_ssp(test_context, ssp: SSP_2024) -> None:
     assert {"n", "y"} == set(result.dims)
 
 
-def test_iea_eei_fv():
-    # TODO expand with additional cases
-    result = iea_eei_fv("tonne-kilometres", dict(regions="R12"))
-
-    assert 12 == len(result)
-
-
 DATA = """
 n        y     value
 R11_AFR  2020  0