Merge branch 'main' into technology-data-13.4

Author: Michael Lindner

.github/workflows/codeql.yaml

@@ -55,11 +55,11 @@ jobs:
         # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
@@ -87,6 +87,6 @@ jobs:
         exit 1
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/push-images.yaml

@@ -16,7 +16,7 @@ jobs:
     name: dev-env
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         fetch-depth: 0
 

.github/workflows/test.yaml

@@ -8,7 +8,6 @@ on:
     branches:
     - main
   schedule:
-  - cron: "0 5 * * 1-6"
   - cron: "0 5 * * 0"
   workflow_dispatch:
 
@@ -35,7 +34,7 @@ jobs:
         shell: bash -l {0}
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Setup env file path (ubuntu)
       if: matrix.os == 'ubuntu'
@@ -53,8 +52,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
@@ -70,7 +69,7 @@ jobs:
         path: |
           data
           cutouts
-          resources/ariadne_database.csv
+          data/ariadne_database.csv
         key: data-cutouts-${{ env.WEEK }}
 
     - uses: conda-incubator/setup-miniconda@v3

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

@@ -19,7 +19,7 @@ jobs:
       run:
         shell: bash -l {0}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Setup conda
       uses: conda-incubator/setup-miniconda@v3
@@ -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: |
@@ -78,9 +69,9 @@ jobs:
     needs: update-locked-environment
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Download all artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v5
       with:
         name: lockfiles
         path: envs/

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ ci:
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v5.0.0
+  rev: v6.0.0
   hooks:
   - id: check-merge-conflict
   - id: check-added-large-files
@@ -14,7 +14,7 @@ repos:
 # Run ruff to lint and format
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.12.2
+  rev: v0.13.3
   hooks:
     # Run the linter.
   - id: ruff
@@ -48,6 +48,6 @@ repos:
 
   # Format Snakemake rule / workflow files
 - repo: https://github.com/snakemake/snakefmt
-  rev: v0.11.0
+  rev: v0.11.2
   hooks:
   - id: snakefmt

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 - Updated technology-data to v0.13.4
+- Simplified IIASA database download
+- Bugfix: Enforce stricter H2 derivative import limit to avoid that exports of one type of derivative compensate for imports of another
+- Added an option to source mobility demand from UBA MWMS (Projektionsbericht 2025) for the years 2025-2035
+- Renamed functions and script for exogenous mobility demand
+- Improved the transport demand data, added an option to source 2020 and 2025 data from AGEB instead of Aladin
+- Added a helper function to change the weather_year to build_scenario
 - Longer lifetime (40 years) is only applied to existing gas CHPs, not new ones. Added a new config entry `existing_capacities:fill_value_gas_chp_lifetime`
 - Bugfix: gas CHPs are extendable again
 - Simplified scenarion definition and made `Mix` the default scenario

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
@@ -77,7 +77,7 @@ PyPSA-DE is a softfork of PyPSA-EUR. As such, large parts of the functionality a
 
 ## New Config Options
 
-- `iiasa_database` - interaction with IIASA database. Specify a database, and `leitmodelle` for demand and co2 emissions data in specific sectors
+- `pypsa-de` - interaction with IIASA database. Specify a database, and `leitmodelle` for demand and co2 emissions data in specific sectors
 - `wasserstoff_kernnetz` - configure which parts of the Wasserstoff Kernnetz should be included in the model
 - `new_decentral_fossil_boiler_ban` - specify in which country and which years to ban fossil boilers
 - `coal_generation_ban` - specify in which country and which years to ban electricity generation from coal
@@ -105,7 +105,7 @@ SPDX-License-Identifier: CC-BY-4.0
 ![Size](https://img.shields.io/github/repo-size/pypsa/pypsa-eur)
 [![Zenodo PyPSA-Eur](https://zenodo.org/badge/DOI/10.5281/zenodo.3520874.svg)](https://doi.org/10.5281/zenodo.3520874)
 [![Zenodo PyPSA-Eur-Sec](https://zenodo.org/badge/DOI/10.5281/zenodo.3938042.svg)](https://doi.org/10.5281/zenodo.3938042)
-[![Snakemake](https://img.shields.io/badge/snakemake-≥8.14.0-brightgreen.svg?style=flat)](https://snakemake.readthedocs.io)
+[![Snakemake](https://img.shields.io/badge/snakemake-≥9-brightgreen.svg?style=flat)](https://snakemake.readthedocs.io)
 [![Discord](https://img.shields.io/discord/911692131440148490?logo=discord)](https://discord.gg/AnuJBk23FU)
 [![REUSE status](https://api.reuse.software/badge/github.com/pypsa/pypsa-eur)](https://api.reuse.software/info/github.com/pypsa/pypsa-eur)
 

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"