Adjust first-party imports in .model.transport tests

Author: khaeru

message_ix_models/tests/model/transport/test_base.py

@@ -2,9 +2,9 @@
 from genno import Computer, KeySeq
 from genno.operator import relabel
 from genno.testing import random_qty
-from message_ix_models.model.structure import get_codes
 
-from message_data.model.transport.base import smooth
+from message_ix_models.model.structure import get_codes
+from message_ix_models.model.transport.base import smooth
 
 
 def test_smooth(recwarn) -> None:

message_ix_models/tests/model/transport/test_build.py

@@ -6,12 +6,12 @@
 import pytest
 from genno import Quantity
 from genno.testing import assert_units
-from message_ix_models.model.structure import get_codes
-from message_ix_models.testing import bare_res
 from pytest import mark, param
 
-from message_data.model.transport import build, report, structure
-from message_data.model.transport.testing import MARK, configure_build
+from message_ix_models.model.structure import get_codes
+from message_ix_models.model.transport import build, report, structure
+from message_ix_models.model.transport.testing import MARK, configure_build
+from message_ix_models.testing import bare_res
 
 log = logging.getLogger(__name__)
 

message_ix_models/tests/model/transport/test_callback.py

@@ -1,6 +1,6 @@
 import pytest
 
-from message_data.model.transport.callback import main
+from message_ix_models.model.transport.callback import main
 
 
 @pytest.mark.xfail(reason="Don't actually attempt to run the code.")

message_ix_models/tests/model/transport/test_config.py

@@ -1,9 +1,9 @@
 import pytest
-from message_ix_models.project.ssp import SSP_2017, SSP_2024
 
-from message_data.model.transport.config import Config
-from message_data.projects.navigate import T35_POLICY
-from message_data.projects.transport_futures import SCENARIO as TF_SCENARIO
+from message_ix_models.model.transport.config import Config
+from message_ix_models.project.navigate import T35_POLICY
+from message_ix_models.project.ssp import SSP_2017, SSP_2024
+from message_ix_models.project.transport_futures import SCENARIO as TF_SCENARIO
 
 FUTURES = (
     ("", TF_SCENARIO.BASE),

message_ix_models/tests/model/transport/test_data.py

@@ -3,12 +3,11 @@
 from genno import Key, Quantity
 from iam_units import registry
 
-from message_data.model.transport import files, testing
-from message_data.model.transport.CHN_IND import get_chn_ind_data, get_chn_ind_pop
-from message_data.model.transport.roadmap import get_roadmap_data
-from message_data.model.transport.testing import MARK
-from message_data.projects.navigate import T35_POLICY
-from message_data.testing import assert_units
+from message_ix_models.model.transport import files, testing
+from message_ix_models.model.transport.CHN_IND import get_chn_ind_data, get_chn_ind_pop
+from message_ix_models.model.transport.roadmap import get_roadmap_data
+from message_ix_models.model.transport.testing import MARK, assert_units
+from message_ix_models.project.navigate import T35_POLICY
 
 
 @pytest.mark.parametrize("file", files.FILES, ids=lambda f: "-".join(f.parts))

message_ix_models/tests/model/transport/test_demand.py

@@ -6,12 +6,12 @@
 import pytest
 from genno import Key
 from genno.testing import assert_units
-from message_ix_models.model.structure import get_codes
-from message_ix_models.project.ssp import SSP_2017, SSP_2024
 from pytest import param
 
-from message_data.model.transport import Config, demand, testing
-from message_data.model.transport.testing import MARK
+from message_ix_models.model.structure import get_codes
+from message_ix_models.model.transport import Config, demand, testing
+from message_ix_models.model.transport.testing import MARK
+from message_ix_models.project.ssp import SSP_2017, SSP_2024
 
 log = logging.getLogger(__name__)
 
@@ -143,7 +143,7 @@ def test_exo(test_context, tmp_path, regions, years, N_node, options):
     ],
 )
 def test_exo_pdt(test_context, ssp, regions="R12", years="B"):
-    from message_data.testing import assert_units
+    from message_ix_models.model.transport.testing import assert_units
 
     c, info = testing.configure_build(
         test_context, regions=regions, years=years, options=dict(ssp=ssp)
@@ -261,7 +261,7 @@ def test_pdt_per_capita(
     Moved from :mod:`.test_operator`.
     """
     # TODO After #551, this is largely similar to test_exo and test_pdt; merge
-    from message_data.model.transport.key import pdt_cap
+    from message_ix_models.model.transport.key import pdt_cap
 
     c, info = testing.configure_build(
         test_context, tmp_path=tmp_path, regions=regions, years=years, options=options

message_ix_models/tests/model/transport/test_disutility.py

@@ -1,6 +1,6 @@
 from ixmp.testing import assert_logs
 
-from message_data.model.transport import testing
+from message_ix_models.model.transport import testing
 
 
 def test_disutility(

message_ix_models/tests/model/transport/test_emission.py

@@ -2,10 +2,10 @@
 import pandas as pd
 import pytest
 from message_ix import make_df
-from message_ix_models.util import broadcast, same_node
 
-from message_data.model.transport import Config, DataSourceConfig, testing
-from message_data.model.transport.emission import ef_for_input, get_emissions_data
+from message_ix_models.model.transport import Config, DataSourceConfig, testing
+from message_ix_models.model.transport.emission import ef_for_input, get_emissions_data
+from message_ix_models.util import broadcast, same_node
 
 
 def test_ef_for_input(test_context):

message_ix_models/tests/model/transport/test_factor.py

@@ -1,4 +1,4 @@
-from message_data.model.transport import factor
+from message_ix_models.model.transport import factor
 
 
 class TestFactor:

message_ix_models/tests/model/transport/test_ikarus.py

@@ -5,10 +5,10 @@
 from numpy.testing import assert_allclose
 from pandas.testing import assert_series_equal
 
-from message_data.model.transport import ikarus, testing
-from message_data.model.transport.non_ldv import UNITS
-from message_data.projects.navigate import T35_POLICY
-from message_data.testing import assert_units
+from message_ix_models.model.transport import ikarus, testing
+from message_ix_models.model.transport.non_ldv import UNITS
+from message_ix_models.model.transport.testing import assert_units
+from message_ix_models.project.navigate import T35_POLICY
 
 
 @pytest.mark.skip(reason="Deprecated, slow")

message_ix_models/tests/model/transport/test_ldv.py

@@ -4,17 +4,17 @@
 import pandas as pd
 import pytest
 from iam_units import registry
-from message_ix_models.model.structure import get_codes
 from pytest import param
 
-from message_data.model.transport import testing
-from message_data.model.transport.ldv import (
+from message_ix_models.model.structure import get_codes
+from message_ix_models.model.transport import testing
+from message_ix_models.model.transport.ldv import (
     constraint_data,
     read_USTIMES_MA3T,
     read_USTIMES_MA3T_2,
 )
-from message_data.projects.navigate import T35_POLICY
-from message_data.testing import assert_units
+from message_ix_models.model.transport.testing import assert_units
+from message_ix_models.project.navigate import T35_POLICY
 
 log = logging.getLogger(__name__)
 

message_ix_models/tests/model/transport/test_migrate.py

@@ -1,6 +1,6 @@
 import pytest
 
-from message_data.model.transport.migrate import import_all
+from message_ix_models.model.transport.migrate import import_all
 
 
 @pytest.mark.xfail(reason="Don't actually attempt to run the code.")

message_ix_models/tests/model/transport/test_operator.py

@@ -2,20 +2,20 @@
 from genno import Quantity
 from genno.testing import assert_qty_equal
 from message_ix import Scenario
-from message_ix_models.project.ssp import SSP_2024
 from numpy.testing import assert_allclose
 
-from message_data.model.transport import Config, factor
-from message_data.model.transport.operator import (
+from message_ix_models.model.transport import Config, factor
+from message_ix_models.model.transport.operator import (
     broadcast_advance,
     distance_ldv,
     distance_nonldv,
     factor_input,
     factor_ssp,
     transport_check,
 )
-from message_data.model.transport.structure import get_technology_groups
-from message_data.projects.navigate import T35_POLICY
+from message_ix_models.model.transport.structure import get_technology_groups
+from message_ix_models.project.navigate import T35_POLICY
+from message_ix_models.project.ssp import SSP_2024
 
 
 @pytest.mark.xfail(reason="Incomplete")

message_ix_models/tests/model/transport/test_report.py

@@ -4,16 +4,19 @@
 
 import genno
 import pytest
-from message_ix_models import ScenarioInfo
-from message_ix_models.report import prepare_reporter, register
 from pytest import mark, param
 
-from message_data.model.transport.report import callback, configure_legacy_reporting
-from message_data.model.transport.testing import (
+from message_ix_models import ScenarioInfo
+from message_ix_models.model.transport.report import (
+    callback,
+    configure_legacy_reporting,
+)
+from message_ix_models.model.transport.testing import (
     MARK,
     built_transport,
     simulated_solution,
 )
+from message_ix_models.report import prepare_reporter, register
 
 if TYPE_CHECKING:
     import message_ix
@@ -22,7 +25,7 @@
 
 
 def test_configure_legacy():
-    from message_data.tools.post_processing.default_tables import TECHS
+    from message_ix_models.report.legacy.default_tables import TECHS
 
     config = deepcopy(TECHS)
 

message_ix_models/tests/model/transport/test_util.py

@@ -4,10 +4,10 @@
 import xarray as xr
 from genno.testing import assert_qty_equal
 from iam_units import registry
-from message_ix_models.report.util import as_quantity
 
-from message_data.model.transport.config import Config, DataSourceConfig
-from message_data.model.transport.util import input_commodity_level
+from message_ix_models.model.transport.config import Config, DataSourceConfig
+from message_ix_models.model.transport.util import input_commodity_level
+from message_ix_models.report.util import as_quantity
 
 
 def test_add_cl(test_context):