BertoGBG · BertoGBG · Jan 27, 2026 · Mar 14, 2026 · Mar 21, 2026 · Mar 21, 2026
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -28,7 +28,7 @@ jobs:
       uses: actions/checkout@v6
 
     - name: Setup micromamba
-      uses: mamba-org/setup-micromamba@v2
+      uses: mamba-org/setup-micromamba@v3
       with:
         micromamba-version: latest
         environment-file: environment.yaml

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -17,7 +17,7 @@ repos:
 # Run ruff to lint and format
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.14.10
+  rev: v0.15.9
   hooks:
     # Run the linter.
   - id: ruff
@@ -27,7 +27,7 @@ repos:
 
   # Find common spelling mistakes in comments and docstrings
 - repo: https://github.com/codespell-project/codespell
-  rev: v2.4.1
+  rev: v2.4.2
   hooks:
   - id: codespell
     args: ['--ignore-regex="(\b[A-Z]+\b)"', '--ignore-words-list=fom,appartment,bage,ore,setis,tabacco,berfore,vor,pris,WEGE,Wege,Eletricity'] # Ignore capital case words, e.g. country codes
@@ -36,14 +36,14 @@ repos:
 
   # YAML formatting
 - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-  rev: v2.15.0
+  rev: v2.16.0
   hooks:
   - id: pretty-format-yaml
     exclude: pinned\.yaml$
     args: [--autofix, --indent, "2", --preserve-quotes]
 
   # Format Snakemake rule / workflow files
 - repo: https://github.com/snakemake/snakefmt
-  rev: v0.11.2
+  rev: v1.0.0
   hooks:
   - id: snakefmt
diff --git a/Snakefile b/Snakefile
@@ -30,13 +30,13 @@ rule compile_cost_assumptions:
         manual_input="inputs/manual_input.csv",
     output:
         expand("outputs/costs_{year}.csv", year=config["years"]),
+    log:
+        pathlib.Path("logs", "compile_cost_assumptions.log"),
+    conda:
+        "environment.yaml"
     threads: 1
     resources:
         mem=500,
-    conda:
-        "environment.yaml"
-    log:
-        pathlib.Path("logs", "compile_cost_assumptions.log"),
     script:
         "scripts/compile_cost_assumptions.py"
 
@@ -54,13 +54,13 @@ rule compile_cost_assumptions_usa:
         nrel_atb_input_fuel_costs="inputs/US/fuel_costs_usa.csv",
     output:
         expand("outputs/US/costs_{year}.csv", year=config["years"]),
+    log:
+        pathlib.Path("logs", "compile_cost_assumptions_usa.log"),
+    conda:
+        "environment.yaml"
     threads: 1
     resources:
         mem=500,
-    conda:
-        "environment.yaml"
-    log:
-        pathlib.Path("logs", "compile_cost_assumptions_usa.log"),
     script:
         "scripts/compile_cost_assumptions_usa.py"
 
@@ -82,20 +82,20 @@ rule convert_EWG:
         EWG="docu/EWG_LUT_100RE_All_Sectors_Global_Report_2019.pdf",
     output:
         costs="inputs/EWG_costs.csv",
+    conda:
+        "environment.yaml"
     threads: 1
     resources:
         mem=500,
-    conda:
-        "environment.yaml"
     script:
         "scripts/convert_pdf_EWG_to_dataframe.py"
 
 
 rule all:
+    default_target: True
     input:
         rules.compile_cost_assumptions.output,
         rules.compile_cost_assumptions_usa.output,
-    default_target: True
 
 
 rule purge:

diff --git a/docs/release_notes.rst b/docs/release_notes.rst
@@ -1,7 +1,6 @@
 
 ..
   SPDX-FileCopyrightText: Contributors to technology-data <https://github.com/pypsa/technology-data>
-
   SPDX-License-Identifier: GPL-3.0-only
 
 ##########################################
@@ -16,6 +15,27 @@ Upcoming Release
 ..   The features listed below are not released yet, but will be part of the next release! 
 ..   To use the features already you have to use the ``master`` branch.
 
+* Adding `Enhanced Weathering` (or Rocks) as CDR technology. (https://github.com/PyPSA/technology-data/pull/256)
+
+`v0.15.0 <https://github.com/PyPSA/technology-data/releases/tag/v0.15.0>`__ (9th June 2026)
+================================================================================================
+
+**Breaking changes**
+
+* Renamed ``electricity grid connection`` to ``distribution grid reinforcement`` and updated description for more clarity on the technology and consistency with the source.
+
+**Changes**
+
+* Added "Post-combustion carbon capture retrofit - 500 MW(th) biomass-fired boiler" as ``biomass boiler capture`` (https://github.com/PyPSA/technology-data/pull/253).
+
+* Added VOM for carbon capture retrofits: ``biomass CHP capture`` and ``cement capture`` (https://github.com/PyPSA/technology-data/pull/253).
+
+* Added technology data for ``CO2 dense phase compression`` step for transport in large pipelines which is different from the current ``CO2 liquefaction`` technology parameters that is taken for ship transport  (https://github.com/PyPSA/technology-data/pull/273).
+
+* Added missing discount rate for OCGT in US-specific data. (https://github.com/PyPSA/technology-data/pull/269)
+
+* The ``currency_year`` column will now reflect the inflation adjusted currency year instead of the original currency year of the input data. (https://github.com/PyPSA/technology-data/pull/275)
+
 `v0.14.0 <https://github.com/PyPSA/technology-data/releases/tag/v0.14.0>`__ (13th February 2026)
 ================================================================================================
 

diff --git a/inputs/US/discount_rates_usa.csv b/inputs/US/discount_rates_usa.csv
@@ -833,3 +833,45 @@ solar-utility,discount rate,2050,0.0507126462365808,per unit,2022,Market,Conserv
 solar-utility,discount rate,2050,0.0342774493840203,per unit,2022,R&D,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
 solar-utility,discount rate,2050,0.0342774493840203,per unit,2022,R&D,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
 solar-utility,discount rate,2050,0.0342774493840203,per unit,2022,R&D,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2020,0.0394356097560977,per unit,2018,Market,Advanced,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2020,0.0394356097560977,per unit,2018,Market,Conservative,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2020,0.0394356097560977,per unit,2018,Market,Moderate,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2020,0.0394356097560977,per unit,2018,R&D,Advanced,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2020,0.0394356097560977,per unit,2018,R&D,Conservative,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2020,0.0394356097560977,per unit,2018,R&D,Moderate,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2025,0.0535847804878049,per unit,2022,Market,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2025,0.0535847804878049,per unit,2022,Market,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2025,0.0535847804878049,per unit,2022,Market,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2025,0.0535847804878049,per unit,2022,R&D,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2025,0.0535847804878049,per unit,2022,R&D,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2025,0.0535847804878049,per unit,2022,R&D,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2030,0.0535847804878049,per unit,2022,Market,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2030,0.0535847804878049,per unit,2022,Market,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2030,0.0535847804878049,per unit,2022,Market,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2030,0.0535847804878049,per unit,2022,R&D,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2030,0.0535847804878049,per unit,2022,R&D,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2030,0.0535847804878049,per unit,2022,R&D,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2035,0.0535847804878049,per unit,2022,Market,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2035,0.0535847804878049,per unit,2022,Market,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2035,0.0535847804878049,per unit,2022,Market,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2035,0.0535847804878049,per unit,2022,R&D,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2035,0.0535847804878049,per unit,2022,R&D,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2035,0.0535847804878049,per unit,2022,R&D,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2040,0.0535847804878049,per unit,2022,Market,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2040,0.0535847804878049,per unit,2022,Market,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2040,0.0535847804878049,per unit,2022,Market,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2040,0.0535847804878049,per unit,2022,R&D,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2040,0.0535847804878049,per unit,2022,R&D,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2040,0.0535847804878049,per unit,2022,R&D,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2045,0.0535847804878049,per unit,2022,Market,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2045,0.0535847804878049,per unit,2022,Market,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2045,0.0535847804878049,per unit,2022,Market,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2045,0.0535847804878049,per unit,2022,R&D,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2045,0.0535847804878049,per unit,2022,R&D,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2045,0.0535847804878049,per unit,2022,R&D,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2050,0.0535847804878049,per unit,2022,Market,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2050,0.0535847804878049,per unit,2022,Market,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2050,0.0535847804878049,per unit,2022,Market,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2050,0.0535847804878049,per unit,2022,R&D,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2050,0.0535847804878049,per unit,2022,R&D,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2050,0.0535847804878049,per unit,2022,R&D,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
diff --git a/inputs/costs_PyPSA.csv b/inputs/costs_PyPSA.csv
@@ -183,9 +183,6 @@ central solar thermal,2030,lifetime,20,years,HP
 electricity distribution grid,2030,investment,500,EUR/kW,TODO
 electricity distribution grid,2030,lifetime,40,years,TODO
 electricity distribution grid,2030,FOM,2,%/year,TODO
-electricity grid connection,2030,investment,140,EUR/kW,DEA
-electricity grid connection,2030,lifetime,40,years,TODO
-electricity grid connection,2030,FOM,2,%/year,TODO
 decentral oil boiler,2030,investment,156.0140915953699,EUR/kWth,Palzer thesis (https://energiesysteme-zukunft.de/fileadmin/user_upload/Publikationen/PDFs/ESYS_Materialien_Optimierungsmodell_REMod-D.pdf) (+eigene Berechnung)
 decentral oil boiler,2030,lifetime,20.0,years,Palzer thesis (https://energiesysteme-zukunft.de/fileadmin/user_upload/Publikationen/PDFs/ESYS_Materialien_Optimierungsmodell_REMod-D.pdf)
 decentral oil boiler,2030,FOM,2.0,%/year,Palzer thesis (https://energiesysteme-zukunft.de/fileadmin/user_upload/Publikationen/PDFs/ESYS_Materialien_Optimierungsmodell_REMod-D.pdf)