Merge pull request #457 from PyPSA/update-env

update pypsa 0.21.3, vresutils master, lift fiona version restriction

envs/environment.yaml

@@ -10,7 +10,7 @@ dependencies:
 - python>=3.8
 - pip
 
-- pypsa>=0.21.2
+- pypsa>=0.21.3
 - atlite>=0.2.9
 - dask
 
@@ -24,20 +24,20 @@ dependencies:
 - yaml
 - pytables
 - lxml
-- powerplantmatching>=0.5.4
-- numpy
+- powerplantmatching>=0.5.5
+- numpy<1.24
 - pandas
 - geopandas>=0.11.0
 - xarray
 - netcdf4
 - networkx
 - scipy
-- shapely<2.0   # need to address deprecations
+- shapely<2.0
 - progressbar2
 - pyomo
 - matplotlib
 - proj
-- fiona <= 1.18.20    # Till issue https://github.com/Toblerity/Fiona/issues/1085 is not solved
+- fiona
 - country_converter
 
   # Keep in conda environment when calling ipython

scripts/build_shapes.py

@@ -145,7 +145,7 @@ def eez(country_shapes, eez, country_list):
         lambda s: _simplify_polys(s, filterremote=False)
     )
     s = gpd.GeoSeries(
-        {k: v for k, v in s.iteritems() if v.distance(country_shapes[k]) < 1e-3}
+        {k: v for k, v in s.items() if v.distance(country_shapes[k]) < 1e-3}
     )
     s = s.to_frame("geometry")
     s.index.name = "name"