Adjust 1st-party imports of .models 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 .macro import MACRO
+from .message import MESSAGE
+from .message_macro import MESSAGE_MACRO
 from .report import Reporter
 from .util import make_df
 

message_ix/core.py

@@ -793,8 +793,8 @@ def add_macro(
         --------
         :ref:`macro-input-data`
         """
+        from .macro import MACRO
         from .macro.calibrate import EXPERIMENTAL, add_model_data, calibrate
-        from .models import MACRO
 
         # Display a warning
         log.warning(EXPERIMENTAL)

message_ix/macro/calibrate.py

@@ -483,7 +483,7 @@ def _validate_data(name: Optional[str], df: "DataFrame", s: Structures) -> list:
     list of str
         Dimensions/index sets of the validated MESSAGEix parameter.
     """
-    from .models import MACRO
+    from . import MACRO
 
     # Check required dimensions
     if name is None:
@@ -670,7 +670,7 @@ def prepare_computer(
     """
     from ixmp.backend import ItemType
 
-    from .models import MACRO
+    from . import MACRO
 
     if not base.has_solution():
         raise RuntimeError("Scenario must have a solution to add MACRO")

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.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.common
 
     if "GITHUB_ACTIONS" in os.environ:
-        message_ix.models.DEFAULT_CPLEX_OPTIONS["threads"] = 2
+        message_ix.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.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.message import MESSAGE
 from message_ix.testing import make_dantzig
 from message_ix.util import expand_dims
 

message_ix/tests/test_macro.py

@@ -9,8 +9,8 @@
 from ixmp import Platform
 
 from message_ix import Scenario
+from message_ix.macro import MACRO
 from message_ix.macro.calibrate import add_model_data, calibrate, prepare_computer
-from message_ix.models 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.message import MESSAGE
+from message_ix.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.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.macro import MACRO
+from message_ix.message import MESSAGE
 
 if TYPE_CHECKING:
     from message_ix.core import Scenario