Move some fixtures

Author: tsmbland

tests/conftest.py

@@ -22,7 +22,6 @@
 from muse.commodities import CommodityUsage
 from muse.timeslices import setup_module
 
-# Constants
 RANDOM_SEED = 123
 
 DEFAULT_TIMESLICES = """
@@ -207,6 +206,8 @@ def coords() -> Mapping:
     """
     return {
         "technology": ["burger_flipper", "soda_shaker", "deep_frier", "salad_arranger"],
+        "tech_type": ["solid", "liquid", "solid", "liquid"],
+        "fuel": ["person", "person", "oil", "person"],
         "region": ["ASEAN", "USA"],
         "year": [2010, 2030],
         "commodity": [
@@ -279,16 +280,14 @@ def technologies(coords: Mapping) -> Dataset:
         Dataset with technology characteristics
     """
     result = Dataset(coords=coords)
-
-    result["comm_type"] = ("commodity", coords["comm_type"])
-    result["tech_type"] = "technology", ["solid", "liquid", "solid", "liquid"]
-
+    result["comm_type"] = "commodity", coords["comm_type"]
+    result["tech_type"] = "technology", coords["tech_type"]
+    result["fuel"] = "technology", coords["fuel"]
     result = result.set_coords(("comm_type", "tech_type"))
 
-    # Generate random variables
+    # We have a single agent with a share of 1 for all technologies
     result["agent_share"] = var_generator(result, ["technology", "region", "year"])
     result["agent_share"] /= np.sum(result.agent_share)
-    result["agent_share_zero"] = result["agent_share"] * 0
 
     # first create a mask so each tech will have consistent inputs/outputs across years
     # and regions
@@ -638,54 +637,6 @@ def capacity(technologies: Dataset) -> DataArray:
     return create_fake_capacity(20, technologies)
 
 
-@fixture
-def settings(tmpdir) -> dict:
-    """Generate settings for testing.
-
-    Args:
-        tmpdir: Temporary directory path
-
-    Returns:
-        Dictionary with test settings
-    """
-    import toml
-
-    from muse.readers import DEFAULT_SETTINGS_PATH
-    from muse.readers.toml import format_paths
-
-    def drop_optionals(settings: dict) -> None:
-        """Remove optional settings from dictionary."""
-        for k, v in list(settings.items()):
-            if v == "OPTIONAL":
-                settings.pop(k)
-            elif isinstance(v, Mapping):
-                drop_optionals(v)
-
-    settings = toml.load(DEFAULT_SETTINGS_PATH)
-    drop_optionals(settings)
-    out = format_paths(settings, cwd=tmpdir, path=tmpdir, muse_sectors=tmpdir)
-
-    # Add required settings
-    required = {
-        "time_framework": [2010, 2015, 2020],
-        "regions": ["MEX"],
-        "equilibrium": False,
-        "maximum_iterations": 3,
-        "tolerance": 0.1,
-        "interpolation_mode": "linear",
-    }
-    out.update(required)
-
-    # Add required carbon budget settings
-    carbon_budget_required = {
-        "budget": [420000, 413000, 403000],
-        "commodities": ["CO2f", "CO2r", "CH4", "N2O"],
-    }
-    out["carbon_budget_control"].update(carbon_budget_required)
-
-    return out
-
-
 @fixture(autouse=True)
 def warnings_as_errors(request):
     """Configure warnings to be treated as errors during testing.
@@ -762,16 +713,3 @@ def saveme(module_name: str, registry_name: str):
     map(next, iterators)
     yield
     map(next, iterators)
-
-
-@fixture
-def rng(request):
-    """Create a random number generator for testing.
-
-    Args:
-        request: Pytest request object
-
-    Returns:
-        Random number generator instance
-    """
-    return default_rng(getattr(request.config.option, "randomly_seed", None))

tests/test_filters.py

@@ -146,7 +146,7 @@ def test_similar_fuels(retro_agent, search_space, technologies):
     assert (actual == expected).all()
 
 
-def test_currently_existing(retro_agent, search_space, technologies, agent_market, rng):
+def test_currently_existing(retro_agent, search_space, technologies, agent_market):
     # Test with zero capacity
     agent_market.capacity[:] = 0
     actual = currently_existing_tech(
@@ -165,9 +165,9 @@ def test_currently_existing(retro_agent, search_space, technologies, agent_marke
     assert actual.sel(replacement=in_market).all()
 
     # Test with partial capacity
-    techs = rng.choice(
+    techs = np.random.choice(
         list(set(agent_market.technology.values)),
-        1 + rng.choice(range(len(set(agent_market.technology.values)))),
+        1 + np.random.choice(range(len(set(agent_market.technology.values)))),
         replace=False,
     )
     agent_market.capacity[:] = 0
@@ -228,13 +228,13 @@ def test_init_from_tech(demand_share, technologies, agent_market):
     assert not space.any()
 
 
-def test_init_from_asset(technologies, rng):
+def test_init_from_asset(technologies):
     # Create test data
-    technology = rng.choice(technologies.technology, 5)
-    installed = rng.choice((2020, 2025), len(technology))
+    technology = np.random.choice(technologies.technology, 5)
+    installed = np.random.choice((2020, 2025), len(technology))
     year = np.arange(2020, 2040, 5)
     capacity = xr.DataArray(
-        rng.choice([0, 0, 1, 10], (len(technology), len(year))),
+        np.random.choice([0, 0, 1, 10], (len(technology), len(year))),
         coords={
             "technology": ("asset", technology),
             "installed": ("asset", installed),
@@ -253,7 +253,7 @@ def test_init_from_asset(technologies, rng):
     assert set(space.asset.asset.values) == set(capacity.technology.values)
 
 
-def test_init_from_asset_no_assets(technologies, rng):
+def test_init_from_asset_no_assets(technologies):
     agent = namedtuple("DummyAgent", ["assets"])(
         xr.Dataset(dict(capacity=xr.DataArray(0)))
     )

tests/test_readers.py

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from itertools import chain, permutations
 from pathlib import Path
 from unittest.mock import patch
@@ -16,6 +17,35 @@
 ]
 
 
+@fixture
+def settings(tmpdir) -> dict:
+    """Generate settings for testing.
+
+    Args:
+        tmpdir: Temporary directory path
+
+    Returns:
+        Dictionary with test settings
+    """
+    import toml
+
+    from muse.readers import DEFAULT_SETTINGS_PATH
+    from muse.readers.toml import format_paths
+
+    def drop_optionals(settings: dict) -> None:
+        """Remove optional settings from dictionary."""
+        for k, v in list(settings.items()):
+            if v == "OPTIONAL":
+                settings.pop(k)
+            elif isinstance(v, Mapping):
+                drop_optionals(v)
+
+    settings = toml.load(DEFAULT_SETTINGS_PATH)
+    drop_optionals(settings)
+    settings = format_paths(settings, cwd=tmpdir, path=tmpdir, muse_sectors=tmpdir)
+    return settings
+
+
 @fixture
 def user_data_files(settings: dict) -> None:
     """Creates test files related to user data."""