Merge branch 'PyPSA:master' into master

Author: tgilon

.github/dependabot.yaml

@@ -12,3 +12,8 @@ updates:
     github-actions:
       patterns:
       - '*'
+- package-ecosystem: docker
+  directories:
+  - /**/*
+  schedule:
+    interval: weekly

.github/workflows/push-images.yaml

@@ -6,6 +6,10 @@ on:
     - master
   workflow_dispatch:
 
+# retagging must wait for a previous build to finish pushing
+concurrency:
+  group: push-images
+
 env:
   IMAGE_NAME: pypsa/eur-dev-env
 
@@ -43,7 +47,7 @@ jobs:
         fi
 
     - name: 'Add SHA tag to existing image' # when rebuild is not needed
-      if: env.hash_last_changed != github.sha
+      if: env.hash_last_changed != github.sha && github.event_name != 'workflow_dispatch'
       run: |-
         docker pull ghcr.io/${{ env.IMAGE_NAME }}:${{ env.hash_last_changed }}
         docker tag ghcr.io/${{ env.IMAGE_NAME }}:${{ env.hash_last_changed }} ghcr.io/${{ env.IMAGE_NAME }}:${{ github.sha }}

.github/workflows/security-scan.yaml

@@ -3,16 +3,34 @@ on:
   push:
     branches: [master]
     paths: [pixi.lock]
+  # No path filter, a required check must report on every PR
   pull_request:
     branches: [master]
-    paths: [pixi.lock]
   schedule:
   - cron: "0 6 * * *"
   workflow_dispatch:
 
 jobs:
+  changes:
+    name: Detect pixi.lock changes
+    if: github.event_name == 'pull_request'
+    runs-on: ubuntu-latest
+    outputs:
+      pixi: ${{ steps.diff.outputs.pixi }}
+    steps:
+    - id: diff
+      env:
+        GH_TOKEN: ${{ github.token }}
+      run: |
+        files=$(gh api "repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/files" --paginate --jq '.[].filename')
+        grep -qxF pixi.lock <<< "$files" && pixi=true || pixi=false
+        echo "pixi=$pixi" >> "$GITHUB_OUTPUT"
+
   scan:
     name: SBOM and vulnerability scan
+    needs: changes
+    # Skip only when pixi.lock is confirmed unchanged
+    if: ${{ !cancelled() && !(needs.changes.result == 'success' && needs.changes.outputs.pixi == 'false') }}
     runs-on: ubuntu-latest
     permissions:
       security-events: write
@@ -56,14 +74,13 @@ jobs:
         mv normalized.sarif "${{ steps.scan.outputs.sarif }}"
 
     - name: Upload SARIF
-      if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
+      if: github.ref == 'refs/heads/master'
       uses: github/codeql-action/upload-sarif@v4
       with:
         sarif_file: ${{ steps.scan.outputs.sarif }}
         category: pixi-vuln-scan
 
-    # Fork PRs cant upload SARIF (no access to token), so code scannings native diff
-    # does not apply. This builds our own diff from a master-uploaded SARIF artifact instead.
+    # Baseline for the PR CVE diff below
     - name: Upload SARIF as artifact
       if: github.ref == 'refs/heads/master'
       uses: actions/upload-artifact@v7
@@ -72,10 +89,9 @@ jobs:
         path: ${{ steps.scan.outputs.sarif }}
         retention-days: 30
 
-    # Fork PRs cant upload SARIF to code scanning (no token write access), so
-    # diff against the master baseline artifact here instead
-    - name: Download master baseline (fork PRs only)
-      if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
+    # All PRs gate on new CVEs vs the master baseline
+    - name: Download master baseline
+      if: github.event_name == 'pull_request'
       uses: dawidd6/action-download-artifact@v21
       with:
         workflow: security-scan.yaml
@@ -84,8 +100,8 @@ jobs:
         if_no_artifact_found: fail
         path: master-baseline
 
-    - name: Fail on new CVEs (fork PRs only)
-      if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
+    - name: Fail on new CVEs
+      if: github.event_name == 'pull_request'
       env:
         SARIF_PATH: ${{ steps.scan.outputs.sarif }}
       run: |

.pre-commit-config.yaml

@@ -16,7 +16,7 @@ repos:
 # Run ruff to lint and format
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.15.9
+  rev: v0.15.20
   hooks:
     # Run the linter.
   - id: ruff
@@ -51,7 +51,7 @@ repos:
 
   # Format Snakemake rule / workflow files
 - repo: https://github.com/snakemake/snakefmt
-  rev: v1.0.0
+  rev: v2.0.3
   hooks:
   - id: snakefmt
 

Snakefile

@@ -248,6 +248,7 @@ rule create_scenarios:
         "config/create_scenarios.py"
 
 
+# fmt: off[next]
 rule purge:
     run:
         import builtins
@@ -304,7 +305,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 --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
@@ -343,7 +344,7 @@ rule filegraph:
         r"""
         # Generate DOT file using nested snakemake with the dumped final config
         echo "[Rule filegraph] Using final config file: {input.config_file}"
-        snakemake --filegraph all --configfile {input.config_file} --quiet | sed -n "/digraph/,\$p" > {output.dot}
+        snakemake --filegraph all --configfile {input.config_file} --quiet | sed -n "/digraph/,\$p" >{output.dot}
 
         # Generate visualizations from the DOT file
         if [ -s {output.dot} ]; then

config/schema.default.json

@@ -4379,7 +4379,7 @@
         },
         "bev_energy": {
           "default": 0.05,
-          "description": "The average size of battery electric vehicles (BEV) in MWh.",
+          "description": "The average available net battery capacity of battery electric vehicles (BEV) in MWh.",
           "type": "number"
         },
         "bev_charge_efficiency": {
@@ -10864,7 +10864,7 @@
         },
         "bev_energy": {
           "default": 0.05,
-          "description": "The average size of battery electric vehicles (BEV) in MWh.",
+          "description": "The average available net battery capacity of battery electric vehicles (BEV) in MWh.",
           "type": "number"
         },
         "bev_charge_efficiency": {

doc/release_notes.md

@@ -7,6 +7,7 @@
 <!-- Upcoming Release -->
 <!-- ================= -->
 
+* refactor: `prepare_sector_network.py` functions now take `spatial` as an explicit parameter instead of a module-level global.
 * fix: update stale contribution docs (linting and formatting ruff)
 * feat: data version CSV / YAML file can be specified separately or extended by the user in the `data.version_files` config entry ([#2016](https://github.com/PyPSA/pypsa-eur/issues/2016)).
 * Fix: Resolve plotting crashes from missing `tech_colors` entries by adding `heat dsm` color and implementing upfront validation for missing keys in `plot_summary.py` ([#2108](https://github.com/PyPSA/pypsa-eur/issues/2108)).
@@ -55,9 +56,17 @@
 * fix: Ensure `inflow_t` is always defined in `attach_hydro`, resolving a pylint use-before-assignment issue ([#2224](https://github.com/PyPSA/pypsa-eur/pull/2224)).
 * Add missing regex anchor with `re.fullmatch` to `create_zenodo_deposition_cli` utils script ([#2225](https://github.com/PyPSA/pypsa-eur/pull/2225)).
 
+* doc: Add note about deep-discharge protection for BEV available battery capacity ([#2227](https://github.com/PyPSA/pypsa-eur/pull/2227)).
 * doc: Add FAQ section to docs (`faq.md`) with troubleshooting for `SSL: CERTIFICATE_VERIFY_FAILED` during data retrieval behind proxy servers ([#2228](https://github.com/PyPSA/pypsa-eur/pull/2228)).
 * Fix Ultranet (TYNDP 254) to end in Philippsburg (#2236)
 
+* chore: Bump the python version to 3.12 ([#2235](https://github.com/PyPSA/pypsa-eur/pull/2235)). This does not increase the real requirement, because 3.12 is already the effective minimum.
+
+* Fix: `build_electricity_demand_base` fetched the non-existent `load.distribution_key.pop` key instead of correct `population`, silently ignoring the configured value ([#2241](https://github.com/PyPSA/pypsa-eur/pull/2241)).
+* Fix: `fill_missing_years` applied the backward fill across country boundaries, so countries without any Eurostat value silently inherited the values of the next country ([#2242](https://github.com/PyPSA/pypsa-eur/pull/2242)).
+
+* chore: Drop the `grpcio < 1.78` pin and add a temporary `python < 3.14` pin ([#2244](https://github.com/PyPSA/pypsa-eur/pull/2244)). The upper bound on python will be lifted once [#2245](https://github.com/PyPSA/pypsa-eur/issues/2245) is resolved.
+
 ## PyPSA-Eur v2026.02.0 (18th February 2026)
 
 **Features**

doc/supply_demand.md

@@ -536,7 +536,9 @@ For the electrified land transport, country-specific factors are computed by com
 
 For BEVs the user can define the [storage energy capacity](https://github.com/PyPSA/pypsa-eur-sec/blob/3daff49c9999ba7ca7534df4e587e1d516044fc3/config.default.yaml#L173), [charging power capacity](https://github.com/PyPSA/pypsa-eur-sec/blob/3daff49c9999ba7ca7534df4e587e1d516044fc3/config.default.yaml#L176), and [charging efficiency](https://github.com/PyPSA/pypsa-eur-sec/blob/3daff49c9999ba7ca7534df4e587e1d516044fc3/config.default.yaml#L174).
 
-For BEV, smart charging is an option. A [certain share](https://github.com/PyPSA/pypsa-eur-sec/blob/3daff49c9999ba7ca7534df4e587e1d516044fc3/config.default.yaml#L172) of the BEV fleet can shift their charging time. The BEV state of charge is forced to be higher than a [set percentage](https://github.com/PyPSA/pypsa-eur-sec/blob/3daff49c9999ba7ca7534df4e587e1d516044fc3/config.default.yaml#L163), e.g. 75%, every day at a [specified hour](https://github.com/PyPSA/pypsa-eur-sec/blob/3daff49c9999ba7ca7534df4e587e1d516044fc3/config.default.yaml#L164), e.g., 7 am, to ensure that the batteries are sufficiently charged for peak usage in the morning and they not behave as seasonal storage. They also have the option to participate in vehicle-to-grid (V2G) services to facilitate system operation if that [is enabled](https://github.com/PyPSA/pypsa-eur-sec/blob/3daff49c9999ba7ca7534df4e587e1d516044fc3/config.default.yaml#L179).
+For BEV, smart charging is an option. A [certain share](https://github.com/PyPSA/pypsa-eur-sec/blob/3daff49c9999ba7ca7534df4e587e1d516044fc3/config.default.yaml#L172) of the BEV fleet can shift their charging time. The BEV state of charge is forced to be higher than a [set percentage](https://github.com/PyPSA/pypsa-eur-sec/blob/3daff49c9999ba7ca7534df4e587e1d516044fc3/config.default.yaml#L163), e.g. 75%, every day at a [specified hour](https://github.com/PyPSA/pypsa-eur-sec/blob/3daff49c9999ba7ca7534df4e587e1d516044fc3/config.default.yaml#L164), e.g., 7 am, to ensure that the batteries are sufficiently charged for peak usage in the morning and they not behave as seasonal storage.
+No lower limit on the state of charge is imposed, but BEV batteries are considered protected from e.g. deep discharge by the on-board battery management system which only makes the usable capacity available to the vehicle, equal to the configured storage energy capacity.
+They also have the option to participate in vehicle-to-grid (V2G) services to facilitate system operation if that [is enabled](https://github.com/PyPSA/pypsa-eur-sec/blob/3daff49c9999ba7ca7534df4e587e1d516044fc3/config.default.yaml#L179).
 
 The battery cost of BEV is not included in the model since it is assumed that BEV owners buy them to primarily satisfy their mobility needs.
 

docker/dev-env/Dockerfile

@@ -2,14 +2,13 @@
 #
 # SPDX-License-Identifier: CC0-1.0
 
-FROM ghcr.io/prefix-dev/pixi:0.63.2
+FROM ghcr.io/prefix-dev/pixi:0.75.0
 
 LABEL org.opencontainers.image.source=https://github.com/PyPSA/pypsa-eur
 
-RUN pixi self-update
-
+# ca-certificates: pixi >=0.64 uses system CA certs, base image ships none
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends bash git && \
+    apt-get install -y --no-install-recommends ca-certificates bash git && \
     rm -rf /var/lib/apt/lists/*
 
 # Install pixi env at /opt/pixi-env (allow for bind mounts)