Merge branch 'merge-upstream-26-01-05' into improvements-from-2030-study

Author: lindnemi

.pre-commit-config.yaml

@@ -18,7 +18,7 @@ repos:
 # Run ruff to lint and format
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.13.3
+  rev: v0.14.10
   hooks:
     # Run the linter.
   - id: ruff

envs/default_linux-64.pin.txt

@@ -49,6 +49,7 @@ dependencies:
 - pre-commit >=4.3.0
 - proj >=9.6.2
 - pylint >=4.0.2
+- pydeck >0.6
 - pypsa >=0.35.2
 - pyscipopt >=5.6.0
 - pytables >=3.10.2

envs/default_osx-64.pin.txt

@@ -78,6 +78,7 @@ powerplantmatching = ">=0.5.15"
 pre-commit = ">=4.3.0"
 proj = ">=9.6.2"
 pylint = ">=4.0.2"
+pydeck = ">0.6"  # pypsa fails to import with pydeck <0.6, lower bound was only added from pypsa 1.0.6
 pypsa = ">=0.35.2"
 pyscipopt = ">=5.6.0"
 pytables = ">=3.10.2"

envs/default_osx-arm64.pin.txt

@@ -268,7 +268,7 @@ rule determine_availability_matrix:
         renewable=config_provider("renewable"),
     input:
         unpack(input_ua_md_availability_matrix),
-        corine=ancient(f"{rules.retrieve_corine.output['tif_file']}"),
+        corine=ancient(rules.retrieve_corine.output["tif_file"]),
         natura=lambda w: (
             f"{NATURA_DATASET["folder"]}/natura.tiff"
             if config_provider("renewable", w.technology, "natura")(w)

envs/default_win-64.pin.txt

@@ -83,7 +83,11 @@ def config_provider(*keys, default=None):
 @lru_cache
 def load_data_versions(file_path):
     data_versions = pd.read_csv(
-        file_path, dtype=str, na_filter=False, delimiter=",", comment="#"
+        file_path,
+        dtype=str,
+        na_filter=False,
+        delimiter=",",
+        comment="#",
     )
 
     # Turn 'tags' column from string representation of list to individual columns
@@ -119,7 +123,11 @@ def dataset_version(
     dataset_config = config["data"][
         name
     ]  # TODO as is right now, it is not compatible with config_provider
-    data_versions = load_data_versions("data/versions.csv")
+
+    # To use PyPSA-Eur as a snakemake module, the path to the versions.csv file needs to be
+    # registered relative to the current file with Snakemake:
+    fp = workflow.source_path("../data/versions.csv")
+    data_versions = load_data_versions(fp)
 
     dataset = data_versions.loc[
         (data_versions["dataset"] == name)