From 7141ce9e5c71ef72348ae8ff2acdd33ec017e777 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Fri, 8 Nov 2019 17:02:42 +0100 Subject: [PATCH] environment: update to pypsa v0.15 --- environment.docs.yaml | 3 +-- environment.yaml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/environment.docs.yaml b/environment.docs.yaml index bb076475..3322f8aa 100644 --- a/environment.docs.yaml +++ b/environment.docs.yaml @@ -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 diff --git a/environment.yaml b/environment.yaml index dc7baee8..90367fae 100644 --- a/environment.yaml +++ b/environment.yaml @@ -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