Merge pull request #44 from open-energy-transition/merge-upstream-15-07

Merge changes from upstream

Author: tgilon

.github/workflows/update-pinned-env.yaml

@@ -43,15 +43,6 @@ jobs:
         for file in envs/*.lock.yml; do
           mv "$file" "${file%.yml}.yaml"
         done
-    - name: Add SPDX headers to lock files
-      run: |
-        SPDX_HEADER="# SPDX-FileCopyrightText: Contributors to PyPSA-Eur <https://github.com/pypsa/pypsa-eur>\n# SPDX-License-Identifier: CC0-1.0\n"
-
-        # Add header to all generated lock files
-        for file in envs/*.lock.yaml; do
-          echo "Adding header to $file"
-          echo -e "$SPDX_HEADER" | cat - "$file" > temp && mv temp "$file"
-        done
 
     - name: Insert environment name in lock files
       run: |

.pre-commit-config.yaml

@@ -17,7 +17,7 @@ repos:
 # Run ruff to lint and format
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.11.8
+  rev: v0.12.2
   hooks:
     # Run the linter.
   - id: ruff
@@ -44,7 +44,7 @@ repos:
 
   # YAML formatting
 - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-  rev: v2.14.0
+  rev: v2.15.0
   hooks:
   - id: pretty-format-yaml
     exclude: (pinned\.yaml|\.lock\.yaml)$

.reuse/dep5

@@ -6,7 +6,7 @@ cff-version: 1.1.0
 message: "If you use this package, please cite it in the following way."
 title: "PyPSA-Eur: An open sector-coupled optimisation model of the European energy system"
 repository: https://github.com/pypsa/pypsa-eur
-version: v2025.04.0
+version: v2025.07.0
 license: MIT
 authors:
   - family-names: Brown

CITATION.cff

@@ -84,6 +84,7 @@ test:
 	snakemake -call make_summary_perfect --configfile config/test/config.perfect.yaml
 	snakemake -call resources/test-elec-clusters/networks/base_s_adm.nc --configfile config/test/config.clusters.yaml
 	snakemake -call --configfile config/test/config.scenarios.yaml -n
+	snakemake -call plot_power_networks_clustered --configfile config/test/config.tyndp.yaml
 	echo "All tests completed successfully."
 
 unit-test:
@@ -97,6 +98,7 @@ clean-tests:
 	snakemake -call make_summary_perfect --configfile config/test/config.perfect.yaml --delete-all-output
 	snakemake -call resources/test-elec-clusters/networks/base_s_adm.nc --configfile config/test/config.clusters.yaml --delete-all-output
 	snakemake -call --configfile config/test/config.scenarios.yaml -n --delete-all-output
+	snakemake -call plot_power_networks_clustered --configfile config/test/config.tyndp.yaml --delete-all-output
 
 # Removes all created files except for large cutout files (similar to fresh clone)
 reset:

Makefile

@@ -0,0 +1,25 @@
+version = 1
+SPDX-PackageName = "PyPSA-Eur"
+SPDX-PackageSupplier = "Tom Brown <t.brown@tu-berlin.de>"
+SPDX-PackageDownloadLocation = "https://github.com/pypsa/pypsa-eur"
+
+[[annotations]]
+path = [
+    "data/**",
+    "doc/configtables/*",
+    "doc/data.csv",
+    "doc/img/*",
+    "test/test_data/*",
+]
+SPDX-FileCopyrightText = "The PyPSA-Eur Authors"
+SPDX-License-Identifier = "CC-BY-4.0"
+
+[[annotations]]
+path = [
+    ".github/**",
+    "borg-it",
+    "envs/*.lock.yaml",
+    "matplotlibrc",
+]
+SPDX-FileCopyrightText = "The PyPSA-Eur Authors"
+SPDX-License-Identifier = "CC0-1.0"

REUSE.toml

@@ -20,7 +20,11 @@ from scripts._helpers import (
 
 configfile: "config/config.default.yaml"
 configfile: "config/plotting.default.yaml"
-configfile: "config/config.yaml"
+
+
+if Path("config/config.yaml").exists():
+
+    configfile: "config/config.yaml"
 
 
 run = config["run"]
@@ -199,7 +203,7 @@ rule rulegraph:
         r"""
         # Generate DOT file using nested snakemake with the dumped final config
         echo "[Rule rulegraph] Using final config file: {input.config_file}"
-        snakemake --rulegraph all --configfile {input.config_file} --quiet | sed -n "/digraph/,\$p" > {output.dot}
+        snakemake --rulegraph --configfile {input.config_file} --quiet | sed -n "/digraph/,\$p" > {output.dot}
 
         # Generate visualizations from the DOT file
         if [ -s {output.dot} ]; then