Merge branch 'main' into data-maintenance

Author: lkstrp

.github/workflows/codeql.yaml

@@ -55,7 +55,7 @@ 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

.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'

.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
@@ -69,7 +69,7 @@ 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@v5
       with:

CHANGELOG.md

@@ -1,5 +1,6 @@
 # Changelog
 - 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

envs/environment.yaml

@@ -71,9 +71,6 @@ dependencies:
 - ruff
 - pylint
 
-# Temporary pins
-- ixmp4<0.10.0
-
 - pip:
   - gurobipy
   - highspy