update pypsa, vresutils master, lift fione restriction

This commit is contained in:
Fabian Neumann 2022-12-27 10:51:02 +01:00
parent 01cc146733
commit 06bee06d56

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,7 +24,7 @@ dependencies:
- yaml - yaml
- pytables - pytables
- lxml - lxml
- powerplantmatching>=0.5.4 - powerplantmatching>=0.5.5
- numpy - numpy
- pandas - pandas
- geopandas>=0.11.0 - geopandas>=0.11.0
@ -37,7 +37,7 @@ dependencies:
- 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
@ -56,5 +56,5 @@ dependencies:
- pyxlsb - pyxlsb
- pip: - pip:
- vresutils>=0.3.1 - git+https://github.com/fresna/vresutils.git#egg=vresutils
- tsam>=1.1.0 - tsam>=1.1.0