From 1d7c736d2c8ac4107e7a673048343b3d1c5323a5 Mon Sep 17 00:00:00 2001 From: ekatef Date: Tue, 24 Dec 2024 13:48:58 +0100 Subject: [PATCH 1/5] Update release notes --- doc/release_notes.rst | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/release_notes.rst b/doc/release_notes.rst index cf5b93895..7ded9911b 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -13,13 +13,21 @@ This part of documentation collects descriptive release notes to capture the mai **New Features and Major Changes** + +**Minor Changes and bug-fixing** + + +PyPSA-Earth 0.6.0 +================= + +**New Features and Major Changes (24th December 2024)** + * Include option in the config to allow for custom airport data `PR #1241 `__ * Added Dev Containers and docker as an option to get started with pypsa-earth `PR #1228 `__ * Add a list of PyPSA-Earth applications in academic and industrial projects `PR #1255 `__ - * Computational improvements of build_osm_network `PR #845 `__ * Boost computational performances of set_lines_ids with cKDTree by scipy `PR #806 `__ @@ -28,8 +36,6 @@ This part of documentation collects descriptive release notes to capture the mai * Boost computational performances of fix_overpassing_line `PR #807 `__ -**Minor Changes and bug-fixing** - * Added electricity bus to Fischer-Tropsch in prepare_sector_network.py `PR #1226 `__ * Update BW, NG and BJ tutorial databundles to include gadm-like sources from geoboundaries `PR #1257 `__ From 5fa5ce5c82c0ed110030804bda798f189c1a1288 Mon Sep 17 00:00:00 2001 From: ekatef Date: Tue, 24 Dec 2024 13:53:07 +0100 Subject: [PATCH 2/5] Add a clarification to the release guide --- doc/release_notes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 7ded9911b..d98594e82 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -543,7 +543,7 @@ Release Process * Make sure thah pinned versions of the environments ``*-pinned.yaml`` in ``envs`` folder are up-to-date. -* Update version number in ``doc/conf.py`` and ``*config.*.yaml``. +* Update version number in ``doc/conf.py``, ``default.config.yaml``, ``tutorial.config.yaml`` and ``test/config.*.yaml``. * Open, review and merge pull request for branch ``release-v0.x.x``. Make sure to close issues and PRs or the release milestone with it (e.g. closes #X). From 6825b449a55862dc7a96170967ed33e5f4e8baba Mon Sep 17 00:00:00 2001 From: ekatef Date: Tue, 24 Dec 2024 13:53:51 +0100 Subject: [PATCH 3/5] Update the config versions --- config.default.yaml | 2 +- config.tutorial.yaml | 2 +- doc/conf.py | 2 +- test/config.custom.yaml | 2 +- test/config.landlock.yaml | 2 +- test/config.monte_carlo.yaml | 2 +- test/config.sector.yaml | 2 +- test/config.test_myopic.yaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config.default.yaml b/config.default.yaml index 715a8a4a9..ed8554002 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: CC0-1.0 -version: 0.5.0 +version: 0.6.0 tutorial: false logging: diff --git a/config.tutorial.yaml b/config.tutorial.yaml index 7ada63032..8f31af9bf 100644 --- a/config.tutorial.yaml +++ b/config.tutorial.yaml @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: CC0-1.0 -version: 0.5.0 +version: 0.6.0 tutorial: true diff --git a/doc/conf.py b/doc/conf.py index cf4323277..b8ff6c30c 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -65,7 +65,7 @@ copyright = f"{datetime.datetime.today().year}, {author}" # The full version, including alpha/beta/rc tags -release = "0.5.0" +release = "0.6.0" # The name of the Pygments (syntax highlighting) style to use. pygments_style = "sphinx" diff --git a/test/config.custom.yaml b/test/config.custom.yaml index a596a932d..5cd36f44f 100644 --- a/test/config.custom.yaml +++ b/test/config.custom.yaml @@ -3,7 +3,7 @@ # SPDX-License-Identifier: CC0-1.0 ### CHANGES TO CONFIG.TUTORIAL.YAML ### -version: 0.5.0 +version: 0.6.0 run: name: "custom" diff --git a/test/config.landlock.yaml b/test/config.landlock.yaml index 913211f29..fc267e829 100644 --- a/test/config.landlock.yaml +++ b/test/config.landlock.yaml @@ -3,7 +3,7 @@ # SPDX-License-Identifier: CC0-1.0 ### CHANGES TO CONFIG.TUTORIAL.YAML ### -version: 0.5.0 +version: 0.6.0 countries: ["BW"] diff --git a/test/config.monte_carlo.yaml b/test/config.monte_carlo.yaml index 034dd51cd..c35dde51f 100644 --- a/test/config.monte_carlo.yaml +++ b/test/config.monte_carlo.yaml @@ -3,7 +3,7 @@ # SPDX-License-Identifier: CC0-1.0 ### CHANGES TO CONFIG.TUTORIAL.YAML ### -version: 0.5.0 +version: 0.6.0 monte_carlo: options: diff --git a/test/config.sector.yaml b/test/config.sector.yaml index abc250e0c..670344b0a 100644 --- a/test/config.sector.yaml +++ b/test/config.sector.yaml @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: AGPL-3.0-or-later -version: 0.5.0 +version: 0.6.0 tutorial: true run: diff --git a/test/config.test_myopic.yaml b/test/config.test_myopic.yaml index 05f3c71a1..382def55f 100644 --- a/test/config.test_myopic.yaml +++ b/test/config.test_myopic.yaml @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: AGPL-3.0-or-later -version: 0.5.0 +version: 0.6.0 logging_level: INFO tutorial: true From d31212da7970b4f63ea13cc36ddf0becc9dabe1e Mon Sep 17 00:00:00 2001 From: ekatef Date: Tue, 24 Dec 2024 14:10:59 +0100 Subject: [PATCH 4/5] Clarify the release guidance --- doc/release_notes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/release_notes.rst b/doc/release_notes.rst index d98594e82..cded5bcae 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -549,7 +549,7 @@ Release Process Make sure to close issues and PRs or the release milestone with it (e.g. closes #X). Run ``pre-commit run --all`` locally and fix any issues. -* Tag a release on Github via ``git tag v0.x.x``, ``git push``, ``git push --tags``. Include release notes in the tag message. +* Update and checkout your local `main` and tag a release with ``git tag v0.x.x``, ``git push``, ``git push --tags``. Include release notes in the tag message using Github UI. * Upload code to `zenodo code repository `_ with `GPLv3 license `_. From de1bc5a9c8c8681de5f233517f0a69f14d3ad831 Mon Sep 17 00:00:00 2001 From: Davide Fioriti <67809479+davide-f@users.noreply.github.com> Date: Tue, 24 Dec 2024 15:10:07 +0100 Subject: [PATCH 5/5] Restore minor changes --- doc/release_notes.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/release_notes.rst b/doc/release_notes.rst index cded5bcae..280904488 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -36,6 +36,8 @@ PyPSA-Earth 0.6.0 * Boost computational performances of fix_overpassing_line `PR #807 `__ +**Minor Changes and bug-fixing** + * Added electricity bus to Fischer-Tropsch in prepare_sector_network.py `PR #1226 `__ * Update BW, NG and BJ tutorial databundles to include gadm-like sources from geoboundaries `PR #1257 `__