Merge pull request #1276 from davide-f/test_linopy_latest_gpd

Update environment after linopy PR

.github/workflows/test.yml

@@ -31,8 +31,8 @@ jobs:
           env_file: envs/linux-pinned.yaml
         - os: macos
           env_file: envs/macos-pinned.yaml
-        # - os: windows
-        #   env_file: envs/windows-pinned.yaml
+        - os: windows
+          env_file: envs/windows-pinned.yaml
 
     defaults:
       run:

README.md

@@ -121,10 +121,10 @@ There are multiple ways to get involved and learn more about our work:
 
 ## Running the model in previous versions
 
-The model can be run in previous versions by checking out the respective tag. For instance, to run the model in version 0.4.1, which is the last version before the repo `pypsa-earth-sec` was merged, the following command can be used:
+The model can be run in previous versions by checking out the respective tag. For instance, to run the model in version 0.6.0, which is the last version before the repo `pypsa-earth-sec` was merged, the following command can be used:
 
 ```bash
-git checkout v0.4.1
+git checkout v0.6.0
 ```
 After checking out the tag, the model can be run as usual. Please make sure to install the required packages for the respective version.
 

Snakefile

@@ -553,6 +553,7 @@ rule add_electricity:
 
 rule simplify_network:
     params:
+        aggregation_strategies=config["cluster_options"]["aggregation_strategies"],
         renewable=config["renewable"],
         geo_crs=config["crs"]["geo_crs"],
         cluster_options=config["cluster_options"],
@@ -595,6 +596,7 @@ if config["augmented_line_connection"].get("add_to_snakefile", False) == True:
 
     rule cluster_network:
         params:
+            aggregation_strategies=config["cluster_options"]["aggregation_strategies"],
             build_shape_options=config["build_shape_options"],
             electricity=config["electricity"],
             costs=config["costs"],
@@ -680,6 +682,7 @@ if config["augmented_line_connection"].get("add_to_snakefile", False) == False:
 
     rule cluster_network:
         params:
+            aggregation_strategies=config["cluster_options"]["aggregation_strategies"],
             build_shape_options=config["build_shape_options"],
             electricity=config["electricity"],
             costs=config["costs"],

config.default.yaml

@@ -98,6 +98,7 @@ cluster_options:
       p_nom_max: sum
       p_nom_min: sum
       p_min_pu: mean
+      p_max_pu: weighted_average
       marginal_cost: mean
       committable: any
       ramp_limit_up: max

doc/release_notes.rst

@@ -19,6 +19,10 @@ This part of documentation collects descriptive release notes to capture the mai
 
 * Add a function to calculate length-based efficiencies and apply it to the H2 pipelines. `PR #1192 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1192>`__
 
+* Support of Linopy for Power and Sector-Coupled Modelling and latest PyPSA version `PR #1172 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1172>`__
+
+* Update workflow to geopandas >= 1.0 `PR #1276 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1276>`__
+
 **Minor Changes and bug-fixing**
 
 * Prevent computation of powerplantmatching if replace option is selected for custom_powerplants `PR #1281 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1281>`__
@@ -156,6 +160,7 @@ PyPSA-Earth 0.4.0
 
 * Add an option to use csv format for custom demand imports. `PR #995 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/995>`__
 
+
 **Minor Changes and bug-fixing**
 
 * Minor bug-fixing to run the cluster wildcard min `PR #1019 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1019>`__

envs/environment.yaml

@@ -12,7 +12,8 @@ dependencies:
 - pip
 - mamba   # esp for windows build
 
-- pypsa>=0.24, <0.25
+- pypsa>=0.25
+# - atlite>=0.2.4  # until https://github.com/PyPSA/atlite/issues/244 is not merged
 - dask
 # currently the packages are being installed with pip
 # need to move back to conda once the issues will be resolved
@@ -28,13 +29,14 @@ dependencies:
 - memory_profiler
 - ruamel.yaml<=0.17.26
 - pytables
+- pyscipopt # added to compy with the quadratic objective requirement of the clustering script
 - lxml
 - numpy
 # starting from 1.3.5 numpoly requires numpy>2.0 which leads to issues
 - numpoly<=1.3.4
 - pandas
-- geopandas>=0.11.0, <=0.14.3
-- fiona!=1.8.22, <1.10.0
+- geopandas>=1
+- fiona>=1.10
 - xarray>=2023.11.0, <2023.12.0
 - netcdf4
 - networkx
@@ -49,6 +51,7 @@ dependencies:
 - pyogrio
 - numba
 - py7zr
+- tsam>=1.1.0
 
   # Keep in conda environment when calling ipython
 - ipython
@@ -80,11 +83,9 @@ dependencies:
 
 # Default solver for tests (required for CI)
 - glpk
-- ipopt
 - gurobi
 
 - pip:
   - git+https://github.com/davide-f/google-drive-downloader@master  # google drive with fix for virus scan
-  - tsam>=1.1.0
   - chaospy  # lastest version only available on pip
   - fake_useragent

envs/linux-pinned.yaml

@@ -92,6 +92,7 @@ dependencies:
 - contourpy=1.3.1
 - country_converter=1.2
 - cpp-expected=1.1.0
+- cppad=20240000.7
 - cycler=0.12.1
 - cyrus-sasl=2.1.27
 - cytoolz=1.0.1
@@ -119,7 +120,7 @@ dependencies:
 - executing=2.1.0
 - expat=2.6.4
 - filelock=3.16.1
-- fiona=1.9.6
+- fiona=1.10.1
 - fmt=11.0.2
 - folium=0.19.2
 - font-ttf-dejavu-sans-mono=2.37
@@ -140,8 +141,8 @@ dependencies:
 - gdk-pixbuf=2.42.12
 - geographiclib=2.0
 - geojson-rewind=1.1.0
-- geopandas=0.14.3
-- geopandas-base=0.14.3
+- geopandas=1.0.1
+- geopandas-base=1.0.1
 - geopy=2.4.1
 - geos=3.13.0
 - geotiff=1.7.3
@@ -350,6 +351,7 @@ dependencies:
 - metis=5.1.0
 - minizip=4.0.7
 - mistune=3.0.2
+- mpfr=4.2.1
 - mpg123=1.32.9
 - msgpack-python=1.1.0
 - multipledispatch=0.6.0
@@ -432,13 +434,14 @@ dependencies:
 - pydoe2=1.3.0
 - pygments=2.18.0
 - pyogrio=0.10.0
-- pyomo=6.8.2
+- pyomo=6.6.1
 - pyparsing=3.2.0
 - pyppmd=1.1.0
 - pyproj=3.7.0
-- pypsa=0.24.0
+- pypsa=0.28.0
 - pyqt=5.15.9
 - pyqt5-sip=12.12.2
+- pyscipopt=5.2.1
 - pyshp=2.3.1
 - pysocks=1.7.1
 - pytables=3.10.1
@@ -469,11 +472,11 @@ dependencies:
 - rfc3986-validator=0.1.1
 - rioxarray=0.17.0
 - rpds-py=0.22.3
-- rtree=1.3.0
 - ruamel.yaml=0.17.26
 - ruamel.yaml.clib=0.2.8
 - s2n=1.5.10
 - scikit-learn=1.6.0
+- scip=9.2.0
 - scipy=1.14.1
 - seaborn=0.13.2
 - seaborn-base=0.13.2
@@ -497,6 +500,7 @@ dependencies:
 - statsmodels=0.14.4
 - stopit=1.1.2
 - tabulate=0.9.0
+- tbb=2022.0.0
 - tblib=3.0.0
 - terminado=0.18.1
 - texttable=1.7.0
@@ -512,6 +516,7 @@ dependencies:
 - tornado=6.4.2
 - tqdm=4.67.1
 - traitlets=5.14.3
+- tsam=2.3.6
 - types-python-dateutil=2.9.0.20241206
 - typing-extensions=4.12.2
 - typing_extensions=4.12.2

envs/macos-pinned.yaml

@@ -89,6 +89,7 @@ dependencies:
 - contourpy=1.3.1
 - country_converter=1.2
 - cpp-expected=1.1.0
+- cppad=20240000.7
 - cycler=0.12.1
 - cyrus-sasl=2.1.27
 - cytoolz=1.0.1
@@ -114,7 +115,7 @@ dependencies:
 - exceptiongroup=1.2.2
 - executing=2.1.0
 - filelock=3.16.1
-- fiona=1.9.6
+- fiona=1.10.1
 - fmt=11.0.2
 - folium=0.19.2
 - font-ttf-dejavu-sans-mono=2.37
@@ -135,8 +136,8 @@ dependencies:
 - gdk-pixbuf=2.42.12
 - geographiclib=2.0
 - geojson-rewind=1.1.0
-- geopandas=0.14.3
-- geopandas-base=0.14.3
+- geopandas=1.0.1
+- geopandas-base=1.0.1
 - geopy=2.4.1
 - geos=3.13.0
 - geotiff=1.7.3
@@ -243,6 +244,7 @@ dependencies:
 - libgoogle-cloud=2.32.0
 - libgoogle-cloud-storage=2.32.0
 - libgrpc=1.67.1
+- libhwloc=2.11.2
 - libiconv=1.17
 - libintl=0.22.5
 - libjpeg-turbo=3.0.0
@@ -303,6 +305,7 @@ dependencies:
 - metis=5.1.0
 - minizip=4.0.7
 - mistune=3.0.2
+- mpfr=4.2.1
 - msgpack-python=1.1.0
 - multipledispatch=0.6.0
 - multiurl=0.3.3
@@ -382,11 +385,12 @@ dependencies:
 - pyobjc-core=10.3.2
 - pyobjc-framework-cocoa=10.3.2
 - pyogrio=0.10.0
-- pyomo=6.8.2
+- pyomo=6.6.1
 - pyparsing=3.2.0
 - pyppmd=1.1.0
 - pyproj=3.7.0
-- pypsa=0.24.0
+- pypsa=0.28.0
+- pyscipopt=5.2.1
 - pyshp=2.3.1
 - pysocks=1.7.1
 - pytables=3.10.1
@@ -416,10 +420,10 @@ dependencies:
 - rfc3986-validator=0.1.1
 - rioxarray=0.17.0
 - rpds-py=0.22.3
-- rtree=1.3.0
 - ruamel.yaml=0.17.26
 - ruamel.yaml.clib=0.2.8
 - scikit-learn=1.6.0
+- scip=9.2.0
 - scipy=1.14.1
 - seaborn=0.13.2
 - seaborn-base=0.13.2
@@ -442,6 +446,7 @@ dependencies:
 - statsmodels=0.14.4
 - stopit=1.1.2
 - tabulate=0.9.0
+- tbb=2022.0.0
 - tblib=3.0.0
 - terminado=0.18.1
 - texttable=1.7.0
@@ -456,6 +461,7 @@ dependencies:
 - tornado=6.4.2
 - tqdm=4.67.1
 - traitlets=5.14.3
+- tsam=2.3.6
 - types-python-dateutil=2.9.0.20241206
 - typing-extensions=4.12.2
 - typing_extensions=4.12.2
@@ -480,7 +486,6 @@ dependencies:
 - xarray=2023.11.0
 - xerces-c=3.2.5
 - xlrd=2.0.1
-- xorg-libxau=1.0.12
 - xorg-libxdmcp=1.1.5
 - xyzservices=2024.9.0
 - yaml=0.2.5