Adjust 1st-party imports of .model contents

Author: khaeru

message_ix/__init__.py

@@ -8,7 +8,9 @@
 from ixmp.util import DeprecatedPathFinder
 
 from .core import Scenario
-from .models import MACRO, MESSAGE, MESSAGE_MACRO
+from .model.macro import MACRO
+from .model.message import MESSAGE
+from .model.message_macro import MESSAGE_MACRO
 from .report import Reporter
 from .util import make_df
 

message_ix/report/__init__.py

@@ -15,7 +15,7 @@
 )
 from ixmp.report import Reporter as IXMPReporter
 
-from message_ix.models import DIMS
+from message_ix.model.common import DIMS
 
 from .pyam import collapse_message_cols
 

message_ix/testing/__init__.py

@@ -34,10 +34,10 @@ def pytest_report_header(config: pytest.Config, start_path: Path) -> str:
 
 def pytest_sessionstart() -> None:
     """Use only 2 threads for CPLEX on GitHub Actions runners with 2 CPU cores."""
-    import message_ix.models
+    import message_ix.model.common
 
     if "GITHUB_ACTIONS" in os.environ:
-        message_ix.models.DEFAULT_CPLEX_OPTIONS["threads"] = 2
+        message_ix.model.common.DEFAULT_CPLEX_OPTIONS["threads"] = 2
 
 
 # Data for testing
@@ -928,7 +928,7 @@ def snapshots_from_zenodo(
     """
     from pooch import HTTPDownloader, Pooch
 
-    from message_ix.models import MACRO
+    from message_ix.model.macro import MACRO
 
     # Create a pooch 'registry' from `SCENARIOS`
     assert pytestconfig.cache, "Pytest config does not have `.cache` set!"

message_ix/tests/test_feature_storage.py

@@ -20,7 +20,7 @@
 from ixmp.testing import assert_logs
 
 from message_ix import Scenario
-from message_ix.models import MESSAGE
+from message_ix.model.message import MESSAGE
 from message_ix.testing import make_dantzig
 from message_ix.util import expand_dims
 

message_ix/tests/test_macro.py

@@ -9,7 +9,7 @@
 from ixmp import Platform
 
 from message_ix import Scenario, macro
-from message_ix.models import MACRO
+from message_ix.model.macro import MACRO
 from message_ix.report import Quantity
 from message_ix.testing import SCENARIO, make_westeros
 

message_ix/tests/test_models.py

@@ -8,7 +8,8 @@
 import pytest
 from ixmp.backend.jdbc import JDBCBackend
 
-from message_ix.models import MESSAGE, MESSAGE_MACRO
+from message_ix.model.message import MESSAGE
+from message_ix.model.message_macro import MESSAGE_MACRO
 
 if TYPE_CHECKING:
     from ixmp import Platform

message_ix/tests/test_report.py

@@ -21,7 +21,7 @@
 from pandas.testing import assert_frame_equal, assert_series_equal
 
 from message_ix import Scenario
-from message_ix.models import MESSAGE
+from message_ix.model.message import MESSAGE
 from message_ix.report import Reporter, configure
 from message_ix.testing import SCENARIO, make_dantzig, make_westeros
 

message_ix/util/__init__.py

@@ -10,7 +10,8 @@
 from ixmp.backend import ItemType
 from pandas.api.types import is_scalar
 
-from message_ix.models import MACRO, MESSAGE
+from message_ix.model.macro import MACRO
+from message_ix.model.message import MESSAGE
 
 if TYPE_CHECKING:
     from message_ix.core import Scenario