From e51a7f172f2b0781202fb496a8513a97e6e41568 Mon Sep 17 00:00:00 2001 From: Jaro Camphuijsen Date: Mon, 14 Dec 2020 21:10:29 +0100 Subject: [PATCH 1/5] change version number for stable 1.1.0 release --- CHANGELOG.rst | 4 ++-- CITATION.cff | 2 +- era5cli/__version__.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 43ff58d..d2c8071 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,9 +1,9 @@ Release Notes ************* -1.1.0rc1 (2020-12-14) +1.1.0 (2020-12-14) ~~~~~~~~~~~~~~~~~~~~~ -* The 1.1.0 era5cli minor release. +* The stable 1.1.0 era5cli minor release. * Add support for ERA5 preliminary back extension `#58 `_ * Update tests `#57 `_ * Add automated PyPI package building and publishing with github Actions `#62 `_ diff --git a/CITATION.cff b/CITATION.cff index a702279..c358821 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -54,4 +54,4 @@ license: Apache-2.0 message: "If you use this software, please cite it using these metadata." repository-code: "https://github.com/ewatercycle/era5cli" title: era5cli -version: 1.1.0rc1 +version: 1.1.0 diff --git a/era5cli/__version__.py b/era5cli/__version__.py index f8adc6e..a5ac0b1 100644 --- a/era5cli/__version__.py +++ b/era5cli/__version__.py @@ -10,4 +10,4 @@ 'Niels Drost', 'Fakhereh Alidoost', 'Bouwe Andela', 'Jerom Aerts', 'Berend Weel', 'Rolf Hut', 'Klaus Zimmermann') __email__ = 'ewatercycle@esciencecenter.nl' -__version__ = '1.1.0rc1' +__version__ = '1.1.0' From 2419bd46fb3fc5861a8ce5be4b7337b0cb8e3357 Mon Sep 17 00:00:00 2001 From: Jaro Camphuijsen Date: Tue, 15 Dec 2020 09:41:00 +0100 Subject: [PATCH 2/5] test gh-actions workflow conditionals, should skip publishing to test pypi --- .github/workflows/publish-to-pypi.yml | 30 +++++++++++++++++---------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index cb2ba5b..bd12b64 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -1,8 +1,8 @@ name: Publish Python distributions to PyPI and TestPyPI -on: - release: - types: [published] +on: push + # release: + # types: [published] jobs: @@ -32,17 +32,25 @@ jobs: --wheel --outdir dist/ - # Publish the package to test.pypi for every tagged version + # test - name: Publish distribution to Test PyPI - if: startsWith(github.ref, 'refs/tags') + if: "!contains(github.ref, 'gh-actions') && !contains(github.ref, 'rc')" uses: pypa/gh-action-pypi-publish@master with: password: ${{ secrets.test_pypi_password }} repository_url: http://test.pypi.org/legacy/ - # Publish a tagged version on PyPI for non-release candidates - - name: Publish distribution to PyPI - if: startsWith(github.ref, 'refs/tags') && ! contains(github.ref, 'rc') - uses: pypa/gh-action-pypi-publish@master - with: - password: ${{ secrets.pypi_password }} + # # Publish the package to test.pypi for every tagged version + # - name: Publish distribution to Test PyPI + # if: startsWith(github.ref, 'refs/tags') + # uses: pypa/gh-action-pypi-publish@master + # with: + # password: ${{ secrets.test_pypi_password }} + # repository_url: http://test.pypi.org/legacy/ + + # # Publish a tagged version on PyPI for non-release candidates + # - name: Publish distribution to PyPI + # if: "startsWith(github.ref, 'refs/tags') && !contains(github.ref, 'rc')" + # uses: pypa/gh-action-pypi-publish@master + # with: + # password: ${{ secrets.pypi_password }} From aa1c51c3ae75ffe8c7242d8b0959920cf9fd3049 Mon Sep 17 00:00:00 2001 From: Jaro Camphuijsen Date: Tue, 15 Dec 2020 09:43:43 +0100 Subject: [PATCH 3/5] new test for gh action, should publish package to test.pypi and fail (as it already exists) --- .github/workflows/publish-to-pypi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index bd12b64..f2b2650 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -34,7 +34,7 @@ jobs: # test - name: Publish distribution to Test PyPI - if: "!contains(github.ref, 'gh-actions') && !contains(github.ref, 'rc')" + if: "contains(github.ref, 'gh-actions') && !contains(github.ref, 'rc')" uses: pypa/gh-action-pypi-publish@master with: password: ${{ secrets.test_pypi_password }} From ae9796cec69d9efcec8c3e69de05657d3f08007e Mon Sep 17 00:00:00 2001 From: Jaro Camphuijsen Date: Tue, 15 Dec 2020 10:42:54 +0100 Subject: [PATCH 4/5] change version number for 1.1.1 release candidate and remove test step from github actions workflow --- .github/workflows/publish-to-pypi.yml | 30 ++++++++++----------------- CHANGELOG.rst | 4 ++++ CITATION.cff | 2 +- era5cli/__version__.py | 2 +- 4 files changed, 17 insertions(+), 21 deletions(-) diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index f2b2650..4fab09f 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -1,8 +1,8 @@ name: Publish Python distributions to PyPI and TestPyPI -on: push - # release: - # types: [published] +on: + release: + types: [published] jobs: @@ -32,25 +32,17 @@ jobs: --wheel --outdir dist/ - # test + # Publish the package to test.pypi for every tagged version - name: Publish distribution to Test PyPI - if: "contains(github.ref, 'gh-actions') && !contains(github.ref, 'rc')" + if: startsWith(github.ref, 'refs/tags') uses: pypa/gh-action-pypi-publish@master with: password: ${{ secrets.test_pypi_password }} repository_url: http://test.pypi.org/legacy/ - # # Publish the package to test.pypi for every tagged version - # - name: Publish distribution to Test PyPI - # if: startsWith(github.ref, 'refs/tags') - # uses: pypa/gh-action-pypi-publish@master - # with: - # password: ${{ secrets.test_pypi_password }} - # repository_url: http://test.pypi.org/legacy/ - - # # Publish a tagged version on PyPI for non-release candidates - # - name: Publish distribution to PyPI - # if: "startsWith(github.ref, 'refs/tags') && !contains(github.ref, 'rc')" - # uses: pypa/gh-action-pypi-publish@master - # with: - # password: ${{ secrets.pypi_password }} + # Publish a tagged version on PyPI for non-release candidates + - name: Publish distribution to PyPI + if: "startsWith(github.ref, 'refs/tags') && !contains(github.ref, 'rc')" + uses: pypa/gh-action-pypi-publish@master + with: + password: ${{ secrets.pypi_password }} diff --git a/CHANGELOG.rst b/CHANGELOG.rst index d2c8071..ab005d2 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,10 @@ Release Notes ************* +1.1.1rc1 (2020-12-15) +~~~~~~~~~~~~~~~~~~~~~ +* Patch to fix the github actions publish automation `#64 `_ + 1.1.0 (2020-12-14) ~~~~~~~~~~~~~~~~~~~~~ * The stable 1.1.0 era5cli minor release. diff --git a/CITATION.cff b/CITATION.cff index c358821..9a3108d 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -54,4 +54,4 @@ license: Apache-2.0 message: "If you use this software, please cite it using these metadata." repository-code: "https://github.com/ewatercycle/era5cli" title: era5cli -version: 1.1.0 +version: 1.1.1rc1 diff --git a/era5cli/__version__.py b/era5cli/__version__.py index a5ac0b1..76705c3 100644 --- a/era5cli/__version__.py +++ b/era5cli/__version__.py @@ -10,4 +10,4 @@ 'Niels Drost', 'Fakhereh Alidoost', 'Bouwe Andela', 'Jerom Aerts', 'Berend Weel', 'Rolf Hut', 'Klaus Zimmermann') __email__ = 'ewatercycle@esciencecenter.nl' -__version__ = '1.1.0' +__version__ = '1.1.1rc1' From 390abd02c49e29c7341e7d50d52a5f84950ad56d Mon Sep 17 00:00:00 2001 From: Jaro Camphuijsen Date: Tue, 15 Dec 2020 11:10:00 +0100 Subject: [PATCH 5/5] remove release candidate from version tag --- CHANGELOG.rst | 2 +- CITATION.cff | 2 +- era5cli/__version__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ab005d2..c00085e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,7 +1,7 @@ Release Notes ************* -1.1.1rc1 (2020-12-15) +1.1.1 (2020-12-15) ~~~~~~~~~~~~~~~~~~~~~ * Patch to fix the github actions publish automation `#64 `_ diff --git a/CITATION.cff b/CITATION.cff index 9a3108d..71e5c75 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -54,4 +54,4 @@ license: Apache-2.0 message: "If you use this software, please cite it using these metadata." repository-code: "https://github.com/ewatercycle/era5cli" title: era5cli -version: 1.1.1rc1 +version: 1.1.1 diff --git a/era5cli/__version__.py b/era5cli/__version__.py index 76705c3..7ab86d3 100644 --- a/era5cli/__version__.py +++ b/era5cli/__version__.py @@ -10,4 +10,4 @@ 'Niels Drost', 'Fakhereh Alidoost', 'Bouwe Andela', 'Jerom Aerts', 'Berend Weel', 'Rolf Hut', 'Klaus Zimmermann') __email__ = 'ewatercycle@esciencecenter.nl' -__version__ = '1.1.1rc1' +__version__ = '1.1.1'