merge master

Author: TomKae00

.github/workflows/ci.yaml

@@ -24,7 +24,8 @@ jobs:
         shell: bash -l {0}
 
     steps:
-    - uses: actions/checkout@v4
+    - name: Checkout code
+      uses: actions/checkout@v4
 
     - name: Setup micromamba
       uses: mamba-org/setup-micromamba@v2
@@ -38,18 +39,26 @@ jobs:
 
     - name: Run unit tests
       run: |
-        python -m pytest test
+        make unit-test
 
-    - name: Test snakemake workflow for compile_cost_assumptions
+    - name: Test snakemake workflows
       run: |
-        snakemake --cores all -f compile_cost_assumptions
-
-    - name: Test snakemake workflow for compile_cost_assumptions_usa
-      run: |
-        snakemake --cores all -f compile_cost_assumptions_usa
+        make test
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
       with:
         name: technology-data
         path: outputs/
+
+    - name: Check for differences in generated outputs
+      run: |-
+        git config --global --add safe.directory $GITHUB_WORKSPACE
+        git add outputs/
+        if ! git diff --cached --quiet; then
+          echo "Generated outputs differ from the branch. Please commit rerun `snakemake` and commit the changes to the `outputs/*.csv` files."
+          git diff --cached
+          exit 1
+        else
+          echo "No differences found in generated outputs."
+        fi

.pre-commit-config.yaml

@@ -3,6 +3,9 @@
 # SPDX-License-Identifier: GPL-3.0-only
 exclude: "^LICENSES"
 
+ci:
+  autoupdate_schedule: monthly
+
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
   rev: v5.0.0
@@ -14,7 +17,7 @@ repos:
 # Run ruff to lint and format
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.11.2
+  rev: v0.11.7
   hooks:
     # Run the linter.
   - id: ruff

Makefile

@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: Contributors to technology-data <https://github.com/pypsa/technology-data>
+#
+# SPDX-License-Identifier: GPL-3.0-only
+
+# coding: utf-8
+
+.ONESHELL:
+
+.PHONY: test unit-test
+
+# Run default tests
+test:
+	set -e
+	snakemake --cores all -f compile_cost_assumptions --configfile config.yaml
+	snakemake --cores all -f compile_cost_assumptions_usa --configfile config.yaml
+	echo "All tests completed successfully."
+
+unit-test:
+	pytest test

config.yaml

@@ -1,9 +1,6 @@
 # SPDX-FileCopyrightText: Contributors to technology-data <https://github.com/pypsa/technology-data>
 #
 # SPDX-License-Identifier: GPL-3.0-only
-
-version: 0.9.2
-
 # considered years for output data
 years: [2020, 2025, 2030, 2035, 2040, 2045, 2050]
 

docs/release_notes.rst

@@ -11,7 +11,9 @@ Release Notes
 Upcoming Release
 ================
 
-* Removed water-sourced heat pumps, as cost assumptions (based on higher uncertainty range in DEA tables) are a) likely overestimates and b) break pessimistic/optimistic scenarios. Reccomendation: Use excess-heat-sourced heat pump data or see DEA data on seawater-sourced heat pumps.
+* Removed geothermal-sourced heat pumps and fixed previously underestimated costs for geothermal heat source. Recommendation: Use excess-heat-sourced heat pump data for geothermal-sourced heat pumps (only the heat pump part of the costs!) and consult the DEA technology catalogue.
+
+* Removed water-sourced heat pumps, as cost assumptions (based on higher uncertainty range in DEA tables) are a) likely overestimates and b) break pessimistic/optimistic scenarios. Recomendation: Use excess-heat-sourced heat pump data or see DEA data on seawater-sourced heat pumps.
 
 .. .. warning:: 
   
@@ -48,7 +50,17 @@ Upcoming Release
 
 * Inflation rates input file `inputs/prc_hicp_aind__custom_9928419_spreadsheet.xlsx` reporting inflation rates for Europe and US and dating back to Jan 2024 substituted by 'Eurostat_inflation_rates.xlsx` dating back to Feb 2025 + Convert EUR data in `manual_input_usa.csv` in USD + Include inflation adjustments for USD (https://github.com/PyPSA/technology-data/pull/193)
 
-* Update scenarios for US-specific eletrolyzer investment cost (https://github.com/PyPSA/technology-data/pull/194)
+* Update scenarios for US-specific eletrolyzer investment cost (https://github.com/PyPSA/technology-data/pull/194; https://github.com/PyPSA/technology-data/pull/201)
+
+* Removed the `version` field from the `config.yaml` (https://github.com/PyPSA/technology-data/pull/197)
+
+* Adds a Makefile (https://github.com/PyPSA/technology-data/pull/204)
+
+* Adds rounding for the value column of the csv files produced by compile_cost_assumptions_usa (https://github.com/PyPSA/technology-data/pull/206)
+
+* Updates ci.yaml such that it fails if the generated outputs are different than the ones committed (https://github.com/PyPSA/technology-data/pull/205)
+
+* Include further unit tests for compile_cost_assumptions.py (https://github.com/PyPSA/technology-data/pull/210)
 
 `v0.11.0 <https://github.com/PyPSA/technology-data/releases/tag/v0.11.0>`__ (24th January 2025)
 =======================================================================================