Merge branch 'main' into dependabot/github_actions/github-actions-1bd4ecb1c2

Author: lkstrp

.github/workflows/push-images.yaml

@@ -2,14 +2,12 @@ name: Push images
 
 on:
   push:
-
     branches:
     - master
   workflow_dispatch:
 
 env:
   IMAGE_NAME: pypsa/eur-dev-env
-  BASE_ENV: envs/linux-64.lock.yaml
 
 jobs:
   push-image:
@@ -20,9 +18,9 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: 'Get relevant env'
+    - name: 'Get last commit that changed pixi env'
       run: |
-        hash_last_changed=$(git log -1 --pretty=format:%H -- ${{ env.BASE_ENV }})
+        hash_last_changed=$(git log -1 --pretty=format:%H -- pixi.toml pixi.lock)
         echo "hash_last_changed=$hash_last_changed" >> $GITHUB_ENV
 
     - name: 'Login to GitHub Container Registry'

.github/workflows/test.yaml

@@ -1,4 +1,4 @@
-name: Test workflows
+name: Test
 
 on:
   push:
@@ -17,8 +17,30 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  run-tests:
-    name: OS
+  unit-tests:
+    name: Unit
+    runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        shell: bash -l {0}
+
+    steps:
+    - uses: actions/checkout@v6
+
+    - name: Setup Pixi
+      uses: prefix-dev/setup-pixi@v0.9.4
+      with:
+        pixi-version: v0.59.0
+        cache: true
+        cache-write: ${{ github.event_name == 'push' && github.ref_name == 'master' }}
+
+    - name: Run unit tests
+      run: |
+        pixi run unit-tests
+
+  integration-tests:
+    name: Integration
     runs-on: ${{ matrix.os }}-latest
     strategy:
       fail-fast: false
@@ -43,7 +65,6 @@ jobs:
             - 'data/**'
             - 'Snakefile'
             - 'config/**'
-            - 'test/**'
             - 'pixi.toml'
             - 'pixi.lock'
             - '.github/workflows/test.yaml'
@@ -58,51 +79,56 @@ jobs:
         sudo docker builder prune -a --force
         echo "Final disk space"
         df -h
+
     - name: Skip - no source changes
-      if: steps.filter.outputs.src != 'true' && github.event_name != 'schedule'
+      if: steps.filter.outputs.src != 'true' && github.event_name != 'schedule' && github.event_name != 'workflow_dispatch'
       run: echo "Skipping tests because no source code changes detected"
 
     - name: Setup Pixi
-      if: steps.filter.outputs.src == 'true' || github.event_name == 'schedule'
+      if: steps.filter.outputs.src == 'true' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
       uses: prefix-dev/setup-pixi@v0.9.4
       with:
         pixi-version: v0.59.0
         cache: true
-        # Do not cache in branches
-        cache-write: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
+        cache-write: ${{ github.event_name == 'push' && github.ref_name == 'master' }}
 
     - name: Setup cache keys
-      if: steps.filter.outputs.src == 'true' || github.event_name == 'schedule'
+      if: steps.filter.outputs.src == 'true' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
       run: |
-        echo "WEEK=$(date +'%Y%U')" >> $GITHUB_ENV # data and cutouts
+        echo "WEEK=$(date +'%Y%U')" >> $GITHUB_ENV # data
+        echo "MONTH=$(date +'%Y%m')" >> $GITHUB_ENV # cutouts
+        echo "VERSIONS_HASH=${{ hashFiles('data/versions.csv') }}" >> $GITHUB_ENV
 
     - uses: actions/cache@v5
-      if: steps.filter.outputs.src == 'true' || github.event_name == 'schedule'
+      if: steps.filter.outputs.src == 'true' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
       with:
-        path: |
-          data
-          cutouts
-        key: data-cutouts-${{ env.WEEK }}
+        path: data
+        key: data-${{ env.WEEK }}-${{ env.VERSIONS_HASH }}
+
+    - uses: actions/cache@v5
+      if: steps.filter.outputs.src == 'true' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
+      with:
+        path: cutouts
+        key: cutouts-${{ env.MONTH }}
+
+    - name: Restore git-tracked files in data/
+      if: steps.filter.outputs.src == 'true' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
+      run: git checkout HEAD -- data/
 
     - name: Run pylint check on scripts
-      if: steps.filter.outputs.src == 'true' || github.event_name == 'schedule'
+      if: steps.filter.outputs.src == 'true' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
       # check for undefined variables to reuse functions across scripts
       run: |
         pixi run pylint --disable=all --enable=E0601,E0606 --output-format=parseable scripts/add_* scripts/prepare_* scripts/solve_*
 
     - name: Run snakemake test workflows
-      if: steps.filter.outputs.src == 'true' || github.event_name == 'schedule'
+      if: steps.filter.outputs.src == 'true' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
       env:
         SNAKEMAKE_STORAGE_CACHED_HTTP_CACHE: ""
         SNAKEMAKE_STORAGE_CACHED_HTTP_SKIP_REMOTE_CHECKS: "1"
       run: |
         pixi run integration-tests
 
-    - name: Run unit tests
-      if: steps.filter.outputs.src == 'true' || github.event_name == 'schedule'
-      run: |
-        pixi run unit-tests
-
     - name: Upload artifacts
       if: always()
       uses: actions/upload-artifact@v6

.gitignore

@@ -31,6 +31,7 @@ gurobi.log
 /cutouts
 /tmp
 doc/_build
+_build
 
 /scripts/old
 /scripts/create_scenarios.py
@@ -65,6 +66,8 @@ d1gam3xoknrgr2.cloudfront.net/
 
 *~
 
+*.egg-info
+
 *.pyc
 
 *.xlsx

.pixi/config.toml

@@ -3,4 +3,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 pinning-strategy = "latest-up"
-run-post-link-scripts = "false" # set to "insecure" to allow running post-link scripts
+
+# This aligns with default `conda` behaviour.
+# Set to "false" to stop post-link scripts from running.
+run-post-link-scripts = "insecure"

.pre-commit-config.yaml

@@ -1,8 +1,7 @@
 # SPDX-FileCopyrightText: Contributors to PyPSA-Eur <https://github.com/pypsa/pypsa-eur>
 #
 # SPDX-License-Identifier: CC0-1.0
-
-exclude: "^LICENSES"
+exclude: "^LICENSES|^config/schema\\.json$|^config/config\\.default\\.yaml$"
 
 ci:
   autoupdate_schedule: quarterly
@@ -11,7 +10,6 @@ repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
   rev: v6.0.0
   hooks:
-  - id: check-merge-conflict
   - id: check-added-large-files
     args: ["--maxkb=2000"]
 
@@ -31,7 +29,7 @@ repos:
   rev: v2.4.1
   hooks:
   - id: codespell
-    args: ['--ignore-regex="(\b[A-Z]+\b)"', '--ignore-words-list=fom,appartment,bage,ore,setis,tabacco,berfore,vor,pris,bund,GuD,Dezember,Juni,Juli,Produktion,WorstCase'] # Ignore capital case words, e.g. country codes
+    args: ['--ignore-regex="(\b[A-Z]+\b)"', '--ignore-words-list=fom,appartment,bage,ore,setis,tabacco,berfore,vor,pris,bund,ons,GuD,Dezember,Juni,Juli,Produktion,WorstCase'] # Ignore capital case words, e.g. country codes
     types_or: [python, rst, markdown]
     files: ^(scripts|doc)/
 

CITATION.cff

@@ -28,7 +28,7 @@ preferred-citation:
 references:
   - title: "PyPSA-Eur: An open sector-coupled optimisation model of the European energy system"
     repository: https://github.com/pypsa/pypsa-eur
-    version: v2025.07.0
+    version: v2026.02.0
     license: MIT
     authors:
     - family-names: Brown

README.md

@@ -121,9 +121,11 @@ SPDX-License-Identifier: CC-BY-4.0
 # PyPSA-Eur: A Sector-Coupled Open Optimisation Model of the European Energy System
 
 PyPSA-Eur is an open model dataset of the European energy system at the
-transmission network level that covers the full ENTSO-E area. The model is suitable both for operational studies and generation and transmission expansion planning studies.
-The continental scope and highly resolved spatial scale enables a proper description of the long-range
-smoothing effects for renewable power generation and their varying resource availability.
+transmission network level that covers the full ENTSO-E area and all energy sectors, including transport, heating, biomass, industry, and agriculture.
+Besides the power grid, pipeline networks for gas, hydrogen, carbon dioxide, and liquid fuels are included.
+The model is suitable both for planning studies and operational studies.
+The model is built from open data using a Snakemake workflow and fully open source.
+It is designed to be imported into the open-source energy system modelling framework [PyPSA](www.pypsa.org).
 
 The model is described in the [documentation](https://pypsa-eur.readthedocs.io)
 and in the paper
@@ -144,64 +146,55 @@ The model is designed to be imported into the open toolbox
 > Institute of Technology](http://www.kit.edu/english/index.php) funded by the
 > [Helmholtz Association](https://www.helmholtz.de/en/).
 
-> [!WARNING]
-> PyPSA-Eur is under active development and has several
-> [limitations](https://pypsa-eur.readthedocs.io/en/latest/limitations.html) which
-> you should understand before using the model. The github repository
-> [issues](https://github.com/PyPSA/pypsa-eur/issues) collect known topics we are
-> working on (please feel free to help or make suggestions). The
-> [documentation](https://pypsa-eur.readthedocs.io/) remains somewhat patchy. You
-> can find showcases of the model's capabilities in the Joule paper [The potential
-> role of a hydrogen network in
-> Europe](https://doi.org/10.1016/j.joule.2023.06.016), another [paper in Joule
-> with a description of the industry
-> sector](https://doi.org/10.1016/j.joule.2022.04.016), or in [a 2021 presentation
-> at EMP-E](https://nworbmot.org/energy/brown-empe.pdf). We do not recommend to
-> use the full resolution network model for simulations. At high granularity the
-> assignment of loads and generators to the nearest network node may not be a
-> correct assumption, depending on the topology of the underlying distribution
-> grid, and local grid bottlenecks may cause unrealistic load-shedding or
-> generator curtailment. We recommend to cluster the network to a couple of
-> hundred nodes to remove these local inconsistencies. See the discussion in
-> Section 3.4 "Model validation" of the paper.
-
-![PyPSA-Eur Grid Model](doc/img/elec.png)
-
-The dataset consists of:
-
-- A grid model based on a modified [GridKit](https://github.com/bdw/GridKit)
-  extraction of the [ENTSO-E Transmission System
-  Map](https://www.entsoe.eu/data/map/). The grid model contains 7072 lines
-  (alternating current lines at and above 220kV voltage level and all high
-  voltage direct current lines) and 3803 substations.
+
+Among many other things, the dataset consists of:
+
+- A power grid model based on [OpenStreetMap](https://zenodo.org/records/18619025) for voltage levels above 220kV (optional above 60kV).
 - The open power plant database
   [powerplantmatching](https://github.com/PyPSA/powerplantmatching).
-- Electrical demand time series from the
-  [OPSD project](https://open-power-system-data.org/).
-- Renewable time series based on ERA5 and SARAH, assembled using the [atlite tool](https://github.com/PyPSA/atlite).
-- Geographical potentials for wind and solar generators based on land use (CORINE) and excluding nature reserves (Natura2000) are computed with the [atlite library](https://github.com/PyPSA/atlite).
+- Electrical demand time series from the [ENTSO-E Transparency Platform](https://transparency.entsoe.eu/).
+- Renewable time series based on ERA5 and SARAH-3, assembled using [atlite](https://github.com/PyPSA/atlite).
+- Geographical potentials for wind and solar generators based land eligibility analysis in [atlite](https://github.com/PyPSA/atlite).
+- Energy balances compiled from Eurostat and JRC-IDEES datasets.
+
+The high-voltage grid and the power plant fleet are shown in this map of the unclustered model (as of 1 January 2026):
 
-A sector-coupled extension adds demand
-and supply for the following sectors: transport, space and water
-heating, biomass, industry and industrial feedstocks, agriculture,
-forestry and fishing. This completes the energy system and includes
-all greenhouse gas emitters except waste management and land use.
+![PyPSA-Eur Unclustered](doc/img/base.png)
+
+
+For computational reasons the model is usually clustered down
+to 50-250 nodes. The image below shows the electricity network and power plants clustered to NUTS2 regions:
+
+![network diagram](doc/img/elec.png)
 
 This diagram gives an overview of the sectors and the links between
-them:
+them within each model region:
 
 ![sector diagram](doc/img/multisector_figure.png)
 
-Each of these sectors is built up on the transmission network nodes
-from [PyPSA-Eur](https://github.com/PyPSA/pypsa-eur):
 
-![network diagram](https://github.com/PyPSA/pypsa-eur/blob/master/doc/img/base.png?raw=true)
-
-For computational reasons the model is usually clustered down
-to 50-200 nodes.
 
-Already-built versions of the model can be found in the accompanying [Zenodo
-repository](https://doi.org/10.5281/zenodo.3601881).
+# Warnings
+
+PyPSA-Eur is under active development and has several
+[limitations](https://pypsa-eur.readthedocs.io/en/latest/limitations.html) which
+you should understand before using the model. The github repository
+[issues](https://github.com/PyPSA/pypsa-eur/issues) collect known topics we are
+working on (please feel free to help or make suggestions). The
+[documentation](https://pypsa-eur.readthedocs.io/) remains somewhat patchy. You
+can find showcases of the model's capabilities in the Joule paper [The potential
+role of a hydrogen network in
+Europe](https://doi.org/10.1016/j.joule.2023.06.016), another [paper in Joule
+with a description of the industry
+sector](https://doi.org/10.1016/j.joule.2022.04.016), or in [a 2021 presentation
+at EMP-E](https://nworbmot.org/energy/brown-empe.pdf). We do not recommend to
+use the full resolution network model for simulations. At high granularity the
+assignment of loads and generators to the nearest network node may not be a
+correct assumption, depending on the topology of the underlying distribution
+grid, and local grid bottlenecks may cause unrealistic load-shedding or
+generator curtailment. We recommend to cluster the network to a couple of
+hundred nodes to remove these local inconsistencies. See the discussion in
+Section 3.4 "Model validation" of the paper.
 
 # Contributing and Support
 

REUSE.toml

@@ -5,7 +5,6 @@ SPDX-PackageDownloadLocation = "https://github.com/pypsa/pypsa-eur"
 
 [[annotations]]
 path = [
-    "doc/configtables/*",
     "doc/data_inventory.csv",
     "doc/img/*",
     "test/test_data/*",
@@ -20,7 +19,9 @@ path = [
     "pixi.lock",
     "matplotlibrc",
     "envs/*.pin.txt",
-    "envs/environment.yaml"
+    "envs/environment.yaml",
+    "config/config.default.yaml",
+    "config/schema.default.json"
 ]
 SPDX-FileCopyrightText = "The PyPSA-Eur Authors"
 SPDX-License-Identifier = "CC0-1.0"
@@ -41,7 +42,6 @@ path = [
     "data/parameter_corrections.yaml",
     "data/retro/window_assumptions.csv",
     "data/retro/retro_cost_germany.csv",
-    "data/switzerland-new_format-all_years.csv",
     "data/transmission_projects/**",
     "data/unit_commitment.csv",
     "data/versions.csv",