bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #457 from PyPSA/update-env

Browse Source 
update pypsa 0.21.3, vresutils master, lift fiona version restriction
This commit is contained in:
Fabian Neumann 2022-12-27 11:51:24 +01:00 committed by GitHub
commit c025e87b6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
envs/environment.yaml
View File

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

2
scripts/build_shapes.py
View File

@ -145,7 +145,7 @@ def eez(country_shapes, eez, country_list):
lambda s: _simplify_polys(s, filterremote=False) lambda s: _simplify_polys(s, filterremote=False)
) )
s = gpd.GeoSeries( 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 = s.to_frame("geometry")
s.index.name = "name" s.index.name = "name"