update pypsa, vresutils master, lift fione restriction
This commit is contained in:
parent
01cc146733
commit
06bee06d56
@ -10,7 +10,7 @@ dependencies:
|
||||
- python>=3.8
|
||||
- pip
|
||||
|
||||
- pypsa>=0.21.2
|
||||
- pypsa>=0.21.3
|
||||
- atlite>=0.2.9
|
||||
- dask
|
||||
|
||||
@ -24,7 +24,7 @@ dependencies:
|
||||
- yaml
|
||||
- pytables
|
||||
- lxml
|
||||
- powerplantmatching>=0.5.4
|
||||
- powerplantmatching>=0.5.5
|
||||
- numpy
|
||||
- pandas
|
||||
- geopandas>=0.11.0
|
||||
@ -37,7 +37,7 @@ dependencies:
|
||||
- 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
|
||||
@ -56,5 +56,5 @@ dependencies:
|
||||
- pyxlsb
|
||||
|
||||
- pip:
|
||||
- vresutils>=0.3.1
|
||||
- git+https://github.com/fresna/vresutils.git#egg=vresutils
|
||||
- tsam>=1.1.0
|
||||
|
Loading…
Reference in New Issue
Block a user