From c1259bfca480bfdebe3f9dc580fa3b5db25ce681 Mon Sep 17 00:00:00 2001 From: ekatef Date: Thu, 15 Dec 2022 00:24:07 +0300 Subject: [PATCH 1/9] Update a name of a DC linetype --- config.default.yaml | 2 +- config.tutorial.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.default.yaml b/config.default.yaml index 281f52f12..bcbd8979d 100644 --- a/config.default.yaml +++ b/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 diff --git a/config.tutorial.yaml b/config.tutorial.yaml index 070874a03..eef81dc5c 100644 --- a/config.tutorial.yaml +++ b/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 From c75b19f79c0aa06bb64a3b4be64cff400b79ced9 Mon Sep 17 00:00:00 2001 From: ekatef Date: Thu, 15 Dec 2022 19:46:21 +0300 Subject: [PATCH 2/9] Replace local fork with the main repo for PyPSA dependency --- envs/environment.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/envs/environment.yaml b/envs/environment.yaml index 49bd6f58f..30cc3037c 100644 --- a/envs/environment.yaml +++ b/envs/environment.yaml @@ -76,11 +76,10 @@ dependencies: - gurobi - pip: - # - git+https://github.com/pypsa/pypsa.git#egg=pypsa + - 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 From bd2b44c1f3a546611b78fcc0e86879cf8983831a Mon Sep 17 00:00:00 2001 From: ekatef Date: Fri, 16 Dec 2022 10:49:29 +0300 Subject: [PATCH 3/9] Restrict shapely version --- envs/environment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envs/environment.yaml b/envs/environment.yaml index 30cc3037c..d82ea603d 100644 --- a/envs/environment.yaml +++ b/envs/environment.yaml @@ -35,7 +35,7 @@ dependencies: - networkx - scipy - pydoe2 -- shapely>=1.8a1 +- shapely<2 - pre-commit - pyomo - matplotlib<=3.5.2 From 8ff88bd067e8d4d1906a96eabd215f6e838758c2 Mon Sep 17 00:00:00 2001 From: ekatef Date: Sat, 17 Dec 2022 21:47:39 +0300 Subject: [PATCH 4/9] Fix shapely version --- envs/environment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envs/environment.yaml b/envs/environment.yaml index d82ea603d..99cf704cc 100644 --- a/envs/environment.yaml +++ b/envs/environment.yaml @@ -35,7 +35,7 @@ dependencies: - networkx - scipy - pydoe2 -- shapely<2 +- shapely>=1.8a1, <2.0 - pre-commit - pyomo - matplotlib<=3.5.2 From 56f38d42efa6d38351f4a2aaa8cffcde71f783e8 Mon Sep 17 00:00:00 2001 From: ekatef Date: Sat, 17 Dec 2022 23:43:09 +0300 Subject: [PATCH 5/9] Add a release note --- doc/release_notes.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 515669a3f..c1b692605 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -41,6 +41,8 @@ Upcoming Release * Calculate the outputs of retrieve_databundle dynamically depending on settings `PR #529 `__ +* Adapt dependencies on PyPSA to the PyPSA main branch `PR #538 `__ + PyPSA-Earth 0.1.0 ================= From 3463bf92f94207b4b983aec4f3a8a8088b1b43c8 Mon Sep 17 00:00:00 2001 From: ekatef Date: Sun, 18 Dec 2022 22:14:33 +0300 Subject: [PATCH 6/9] Change an installation channel for PyPSA --- envs/environment.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/envs/environment.yaml b/envs/environment.yaml index 99cf704cc..29e303c12 100644 --- a/envs/environment.yaml +++ b/envs/environment.yaml @@ -12,7 +12,7 @@ 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 @@ -76,7 +76,6 @@ 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 From 880443d8983d23eca805836048f2e5b152526e09 Mon Sep 17 00:00:00 2001 From: ekatef Date: Sun, 18 Dec 2022 22:16:33 +0300 Subject: [PATCH 7/9] Add a comment to a powerplantmatching version --- envs/environment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envs/environment.yaml b/envs/environment.yaml index 29e303c12..dc594fef0 100644 --- a/envs/environment.yaml +++ b/envs/environment.yaml @@ -15,7 +15,7 @@ dependencies: - 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.4 # until entsoe-py>=0.5.9 will be available via conda-forge # Dependencies of the workflow itself - xlrd From c1afa58c7ca78cbd28d1dc1ba55d21837edee23e Mon Sep 17 00:00:00 2001 From: Davide Fioriti <67809479+davide-f@users.noreply.github.com> Date: Sun, 25 Dec 2022 14:02:11 +0100 Subject: [PATCH 8/9] Update environment.yaml --- envs/environment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envs/environment.yaml b/envs/environment.yaml index dc594fef0..05873b7d0 100644 --- a/envs/environment.yaml +++ b/envs/environment.yaml @@ -15,7 +15,7 @@ dependencies: - pypsa>=0.21.3 # - atlite>=0.2.4 # until https://github.com/PyPSA/atlite/issues/244 is not merged - dask -# - powerplantmatching>=0.5.4 # until entsoe-py>=0.5.9 will be available via conda-forge +- powerplantmatching>=0.5.5 # Dependencies of the workflow itself - xlrd From 32c46c8851c12906c3a43c5818a4c91d3b71acd6 Mon Sep 17 00:00:00 2001 From: Davide Fioriti <67809479+davide-f@users.noreply.github.com> Date: Sun, 25 Dec 2022 15:18:05 +0100 Subject: [PATCH 9/9] Update environment.yaml Remove ppl by pip --- envs/environment.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/envs/environment.yaml b/envs/environment.yaml index a795227c4..0d10831fc 100644 --- a/envs/environment.yaml +++ b/envs/environment.yaml @@ -76,7 +76,6 @@ dependencies: - gurobi - pip: - - 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 - vresutils>=0.3.1