Merge branch 'PyPSA:master' into master

open-energy-transition · Dec 19, 2024 · 790d3c5 · 790d3c5
2 parents c917a4b + 35b07ed
commit 790d3c5
Show file tree

Hide file tree

Showing 17 changed files with 2,103 additions and 1,319 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -72,6 +72,7 @@ repos:
   rev: v2.14.0
   hooks:
   - id: pretty-format-yaml
+    exclude: pinned\.yaml$
     args: [--autofix, --indent, "2", --preserve-quotes]
 
   # Format Snakemake rule / workflow files

diff --git a/envs/environment.yaml b/envs/environment.yaml
@@ -11,7 +11,7 @@ dependencies:
 - pip
 
 # Inhouse packages
-- pypsa>=0.31
+- pypsa>=0.32
 - atlite>=0.2.9
 - linopy
 - powerplantmatching>=0.5.15,<0.6
@@ -57,7 +57,8 @@ dependencies:
 # GIS dependencies:
 - cartopy
 - descartes
-- rasterio
+- rasterio==1.4.1
+- libgdal-core<3.10.0 # rasterio>=1.4.2 needed for GDAL 3.10
 
 - pip:
   - gurobipy