Merge pull request #538 from ekatef/change_pypsa_dependency

Move PyPSA dependency back to the main repository

config.default.yaml

@@ -141,7 +141,7 @@ lines:
     220.: "Al/St 240/40 2-bundle 220.0"
     300.: "Al/St 240/40 3-bundle 300.0"
     380.: "Al/St 240/40 4-bundle 380.0"
-  dc_type: "DC_custom_linetype"
+  dc_type: "HVDC XLPE 1000"
   s_max_pu: 0.7
   s_nom_max: .inf
   length_factor: 1.25

config.tutorial.yaml

@@ -155,7 +155,7 @@ lines:
     220.: "Al/St 240/40 2-bundle 220.0"
     300.: "Al/St 240/40 3-bundle 300.0"
     380.: "Al/St 240/40 4-bundle 380.0"
-  dc_type: "DC_custom_linetype"
+  dc_type: "HVDC XLPE 1000"
   s_max_pu: 0.7
   s_nom_max: .inf
   length_factor: 1.25

doc/release_notes.rst

@@ -43,6 +43,8 @@ Upcoming Release
 
 * Fix shape bug in the Voronoi cell creation `PR #541 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/541>`__
 
+* Adapt dependencies on PyPSA to the PyPSA main branch `PR #538 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/538>`__
+
 PyPSA-Earth 0.1.0
 =================
 

envs/environment.yaml

@@ -12,10 +12,10 @@ dependencies:
 - pip
 - mamba   # esp for windows build
 
-# - pypsa>=0.17.1
+- pypsa>=0.21.3
 # - atlite>=0.2.4  # until https://github.com/PyPSA/atlite/issues/244 is not merged
 - dask
-  # - powerplantmatching>=0.4.8
+- powerplantmatching>=0.5.5
 
   # Dependencies of the workflow itself
 - xlrd
@@ -76,11 +76,8 @@ dependencies:
 - gurobi
 
 - pip:
-  # - git+https://github.com/pypsa/pypsa.git#egg=pypsa
-  - git+https://github.com/PyPSA/powerplantmatching.git@master
   - git+https://github.com/davide-f/google-drive-downloader@master  # google drive with fix for virus scan
   - git+https://github.com/davide-f/atlite.git@master
-  - git+https://github.com/ekatef/PyPSA.git@master
   - vresutils>=0.3.1
   - tsam>=1.1.0
   - esy-osm-pbf