Merge branch 'main' into update-locked-environment

Author: Micha

.github/workflows/test.yaml

@@ -53,8 +53,8 @@ jobs:
 
     - name: Use base env file if it was changed
       run: |
-        git fetch origin master
-        if git diff --name-only origin/master | grep '${{ env.BASE_ENV }}'; then
+        git fetch origin ${{ github.event.repository.default_branch }}
+        if git diff --name-only origin/${{ github.event.repository.default_branch }} | grep '${{ env.BASE_ENV }}'; then
           echo "Base env ${{ env.BASE_ENV }} changed. Using it instead of locked envs."
           echo "env_file=${{ env.BASE_ENV }}" >> $GITHUB_ENV
         else

.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: |
@@ -80,7 +71,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Download all artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v5
       with:
         name: lockfiles
         path: envs/

Makefile

@@ -82,7 +82,7 @@ test:
 	echo "Build scenarios..."
 	snakemake -call build_scenarios
 	echo "Run DACH config..."
-	snakemake -call ariadne_all --configfile=config/test/config.dach.yaml
+	snakemake -call ariadne_all --until export_ariadne_variables --configfile=config/test/config.dach.yaml
 	echo "All tests completed successfully."
 
 unit-test:
@@ -95,6 +95,7 @@ clean-tests:
 	snakemake -call --configfile config/test/config.myopic.yaml --delete-all-output
 	snakemake -call make_summary_perfect --configfile config/test/config.perfect.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:

README.md

@@ -15,13 +15,13 @@ This repository contains the entire scientific project, including data sources a
 You need `conda` or `mamba` to run the analysis. Using conda, you can create an environment from within which you can run the analysis:
 
 ```
-conda env create -f envs/{os}-pinned.yaml
+conda env create -f envs/{os}.lock.yaml
 ```
 
 Where `{os}` should be replaced with your operating system, e.g. for linux the command would be:
 
 ```
-conda env create -f envs/linux-pinned.yaml
+conda env create -f envs/linux-64.lock.yaml
 ```
 
 ## Run the analysis

REUSE.toml

@@ -0,0 +1,25 @@
+version = 1
+SPDX-PackageName = "PyPSA-Eur"
+SPDX-PackageSupplier = "Tom Brown <[email protected]>"
+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"

Snakefile

@@ -82,6 +82,7 @@ if config["foresight"] == "perfect":
 rule all:
     input:
         expand(RESULTS + "graphs/costs.svg", run=config["run"]["name"]),
+        expand(resources("maps/power-network.pdf"), run=config["run"]["name"]),
         expand(
             resources("maps/power-network-s-{clusters}.pdf"),
             run=config["run"]["name"],
@@ -202,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

config/config.de.yaml

@@ -4,7 +4,7 @@
 
 # docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#run
 run:
-  prefix: 20250717_improve_transport_demand
+  prefix: 20250807_merge_july
   name:
   # - ExPol
   - KN2045_Mix
@@ -313,6 +313,11 @@ sector:
     rural: true
   co2_spatial: true
   biomass_spatial: true
+  ammonia: false
+  methanol:
+    methanol_to_power:
+      ocgt: false
+    biomass_to_methanol: false
   #relax so no infeasibility in 2050 with no land transport demand
   min_part_load_fischer_tropsch: 0.
   regional_oil_demand: true  #set to true if regional CO2 constraints needed
@@ -323,6 +328,7 @@ sector:
   biogas_upgrading_cc: true
   biomass_to_liquid: true
   biomass_to_liquid_cc: true
+  electrobiofuels: false
   cluster_heat_buses: true
   # calculated based on ariadne "Stock|Space Heating"
   # and then 2% of buildings renovated per year to reduce their demand by 80%
@@ -362,7 +368,6 @@ sector:
 
 # docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#industry
 industry:
-  ammonia: false
   steam_biomass_fraction: 0.4
   steam_hydrogen_fraction: 0.3
   steam_electricity_fraction: 0.3