[pre-commit.ci] pre-commit autoupdate (#556)

* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/psf/black: 23.12.1 → 24.1.1](psf/black@23.12.1...24.1.1)
- [github.com/astral-sh/ruff-pre-commit: v0.1.9 → v0.2.0](astral-sh/ruff-pre-commit@v0.1.9...v0.2.0)

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

.pre-commit-config.yaml

@@ -3,12 +3,12 @@ default_language_version:
 
 repos:
   - repo: https://github.com/psf/black
-    rev: 23.12.1
+    rev: 24.1.1
     hooks:
       - id: black
 
   - repo: https://github.com/astral-sh/ruff-pre-commit # https://beta.ruff.rs/docs/usage/#github-action
-    rev: v0.1.9
+    rev: v0.2.0
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

src/calliope/io.py

@@ -133,9 +133,11 @@ def save_netcdf(model_data, path, model=None):
         _serialise(var.attrs)
 
     encoding = {
-        k: {"zlib": False, "_FillValue": None}
-        if v.dtype.kind in ["U", "O"]
-        else {"zlib": True, "complevel": 4}
+        k: (
+            {"zlib": False, "_FillValue": None}
+            if v.dtype.kind in ["U", "O"]
+            else {"zlib": True, "complevel": 4}
+        )
         for k, v in model_data.data_vars.items()
     }
 

src/calliope/model.py

@@ -109,12 +109,10 @@ def __init__(
         if isinstance(model_definition, xr.Dataset):
             self._init_from_model_data(model_definition)
         else:
-            (
-                model_def,
-                self._model_def_path,
-                applied_overrides,
-            ) = load.load_model_definition(
-                model_definition, scenario, override_dict, **kwargs
+            (model_def, self._model_def_path, applied_overrides) = (
+                load.load_model_definition(
+                    model_definition, scenario, override_dict, **kwargs
+                )
             )
             self._init_from_model_def_dict(
                 model_def, applied_overrides, scenario, debug, data_source_dfs

src/calliope/preprocess/data_sources.py

@@ -285,9 +285,11 @@ def _df_to_ds(self, df: pd.DataFrame) -> xr.Dataset:
 
         if "select" in self.input.keys():
             selector = tuple(
-                listify(self.input["select"][name])
-                if name in self.input["select"]
-                else slice(None)
+                (
+                    listify(self.input["select"][name])
+                    if name in self.input["select"]
+                    else slice(None)
+                )
                 for name in tdf.index.names
             )
             tdf = tdf.loc[selector]

tests/conftest.py

@@ -145,9 +145,11 @@ def simple_conversion_plus():
 @pytest.fixture(scope="module")
 def dummy_model_data(config_defaults, model_defaults):
     coords = {
-        dim: ["foo", "bar"]
-        if dim != "techs"
-        else ["foobar", "foobaz", "barfoo", "bazfoo"]
+        dim: (
+            ["foo", "bar"]
+            if dim != "techs"
+            else ["foobar", "foobaz", "barfoo", "bazfoo"]
+        )
         for dim in ALL_DIMS
     }
     carrier_dims = ("nodes", "techs", "carriers")

tests/test_backend_pyomo.py

@@ -1622,9 +1622,9 @@ def cluster_model(
         override = {
             "config.init.time_subset": ["2005-01-01", "2005-01-04"],
             "config.init.time_cluster": "data_sources/cluster_days.csv",
-            "config.init.custom_math": ["storage_inter_cluster"]
-            if storage_inter_cluster
-            else [],
+            "config.init.custom_math": (
+                ["storage_inter_cluster"] if storage_inter_cluster else []
+            ),
             "config.build.cyclic_storage": cyclic,
         }
         if storage_initial: