use pypsa master branch

This commit is contained in:
Fabian Neumann 2019-10-25 12:33:39 +02:00
parent 2a05124c80
commit ad61968dac

View File

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