environment: update to pypsa v0.15

This commit is contained in:
Fabian Neumann 2019-11-08 17:02:42 +01:00
parent ecf8448826
commit 7141ce9e5c
2 changed files with 2 additions and 4 deletions

View File

@ -5,7 +5,7 @@ channels:
dependencies:
#- python
- pip
#- pypsa>=0.14 # until pypsa/pypsa#102 closed
- pypsa>=0.15
- atlite
# Dependencies of the workflow itself
@ -43,7 +43,6 @@ dependencies:
# The FRESNA/KIT stuff is not packaged for conda yet
- pip:
- git+https://github.com/FRESNA/vresutils.git#egg=vresutils
- git+https://github.com/PyPSA/pypsa.git#egg=pypsa # until pypsa/pypsa#102 closed
- git+https://github.com/PyPSA/glaes.git#egg=glaes
- git+https://github.com/PyPSA/geokit.git#egg=geokit
- cdsapi

View File

@ -6,7 +6,7 @@ dependencies:
- python
- pip
#- pypsa>=0.14 # until pypsa/pypsa#102 closed
- pypsa>=0.15
- atlite
# Dependencies of the workflow itself
@ -43,7 +43,6 @@ dependencies:
- pip:
- git+https://github.com/FRESNA/vresutils.git#egg=vresutils
- git+https://github.com/PyPSA/pypsa.git#egg=pypsa # until pypsa/pypsa#102 closed
- git+https://github.com/PyPSA/glaes.git#egg=glaes
- git+https://github.com/PyPSA/geokit.git#egg=geokit
- cdsapi