From 2f745f60b6033c852b9c7cec36c84f665265dbdf Mon Sep 17 00:00:00 2001 From: Volodymyr Savchenko Date: Fri, 16 Aug 2024 10:30:34 +0200 Subject: [PATCH 1/9] use forge badge --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 34461cb3..95d20c86 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ oda_api ========================================== [![PyPI version](https://badge.fury.io/py/oda-api.svg)](https://badge.fury.io/py/oda-api) -![](https://anaconda.org/mmoda/oda-api/badges/version.svg) -![](https://anaconda.org/mmoda/oda-api/badges/latest_release_date.svg) +![](https://anaconda.org//conda-forge/oda-api/badges/version.svg) +![](https://anaconda.org//conda-forge/oda-api/badges/latest_release_date.svg) [![Documentation Status](https://readthedocs.org/projects/oda-api/badge/?version=latest)](https://oda-api.readthedocs.io/en/latest/?badge=latest) From 5323c8dc3e86fc9650560c4c541941f2ccdce54b Mon Sep 17 00:00:00 2001 From: Volodymyr Savchenko Date: Fri, 16 Aug 2024 10:35:11 +0200 Subject: [PATCH 2/9] enable auto-merge --- .github/workflows/python-publish.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 4ab683af..a9fc55a7 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -45,6 +45,11 @@ jobs: assignees: "volodymyrss" title: "Bump version to ${{ steps.bump-version.outputs.new_version }}" branch: "bump-version-${{ steps.bump-version.outputs.new_version }}" + + - name: Enable Pull Request Automerge + run: gh pr merge --merge --auto "1" + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} publish-version: From 177f5241a49411ec9b16451ae745b3ddc331648f Mon Sep 17 00:00:00 2001 From: Volodymyr Savchenko Date: Fri, 16 Aug 2024 10:36:46 +0200 Subject: [PATCH 3/9] create pr --- .github/workflows/python-publish.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index a9fc55a7..3931ff39 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -39,7 +39,8 @@ jobs: echo "::set-output name=new_version::$(git describe --tags --abbrev=0)" - name: Create Pull Request - uses: peter-evans/create-pull-request@v6 + uses: peter-evans/create-pull-request@v6 + id: cpr with: reviewers: "volodymyrss" assignees: "volodymyrss" @@ -47,7 +48,7 @@ jobs: branch: "bump-version-${{ steps.bump-version.outputs.new_version }}" - name: Enable Pull Request Automerge - run: gh pr merge --merge --auto "1" + run: gh pr merge --merge --auto ${{ steps.cpr.outputs.pull-request-number }} env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 5398257157607a8471608e64fb3481b9fadb3c53 Mon Sep 17 00:00:00 2001 From: Volodymyr Savchenko Date: Fri, 16 Aug 2024 10:37:33 +0200 Subject: [PATCH 4/9] create pr comment --- .github/workflows/python-publish.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 3931ff39..493d2469 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -46,6 +46,9 @@ jobs: assignees: "volodymyrss" title: "Bump version to ${{ steps.bump-version.outputs.new_version }}" branch: "bump-version-${{ steps.bump-version.outputs.new_version }}" + body: | + Bump version to ${{ steps.bump-version.outputs.new_version }} + This PR was created automatically by the Bump version workflow. - name: Enable Pull Request Automerge run: gh pr merge --merge --auto ${{ steps.cpr.outputs.pull-request-number }} From 9c47542bc377284ed29a8270f5ef9fca17fa1247 Mon Sep 17 00:00:00 2001 From: Volodymyr Savchenko Date: Fri, 16 Aug 2024 10:41:14 +0200 Subject: [PATCH 5/9] use bot secret pr comment --- .github/workflows/python-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 493d2469..cac9d2da 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -53,7 +53,7 @@ jobs: - name: Enable Pull Request Automerge run: gh pr merge --merge --auto ${{ steps.cpr.outputs.pull-request-number }} env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ secrets.BOT_SECRET }} publish-version: From 28f331c83d7902c6ac0b53a459df2bd9d19d8fd7 Mon Sep 17 00:00:00 2001 From: ODA Release Bot Date: Fri, 16 Aug 2024 08:41:55 +0000 Subject: [PATCH 6/9] =?UTF-8?q?Bump=20version:=201.2.24=20=E2=86=92=201.2.?= =?UTF-8?q?25-dev0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/source/install.rst | 2 +- doc/source/user_guide/TestAPI.ipynb | 4 ++-- doc/source/user_guide/UploadToGallery.ipynb | 2 +- oda_api/pkg_info.json | 2 +- setup.cfg | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/source/install.rst b/doc/source/install.rst index 0d755155..46ed4dfa 100644 --- a/doc/source/install.rst +++ b/doc/source/install.rst @@ -19,7 +19,7 @@ Development version Download code and contribute ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Source code can be found can be found on github https://github.com/oda-hub/oda_api (see https://github.com/oda-hub/oda_api/archive/refs/tags/v1.2.24.tar.gz for latest release bundle). +Source code can be found can be found on github https://github.com/oda-hub/oda_api (see https://github.com/oda-hub/oda_api/archive/refs/tags/v1.2.25-dev0.tar.gz for latest release bundle). To contribute, please feel free to fork the repository, apply your changes, and prepare a pull request. diff --git a/doc/source/user_guide/TestAPI.ipynb b/doc/source/user_guide/TestAPI.ipynb index acbe97d4..1005b8e3 100644 --- a/doc/source/user_guide/TestAPI.ipynb +++ b/doc/source/user_guide/TestAPI.ipynb @@ -4,7 +4,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "# Quick Start (oda api v1.2.24)" + "# Quick Start (oda api v1.2.25-dev0)" ] }, { @@ -1488,7 +1488,7 @@ " 'HDUCLAS2': 'TOTAL',\n", " 'HDUCLAS3': 'RATE',\n", " 'HDUCLASS': 'OGIP',\n", - " 'HDUVERS': '1.2.24',\n", + " 'HDUVERS': '1.2.25-dev0',\n", " 'INSTRUME': 'IBIS',\n", " 'ISDCLEVL': 'SPE',\n", " 'LONGSTRN': 'OGIP 1.0',\n", diff --git a/doc/source/user_guide/UploadToGallery.ipynb b/doc/source/user_guide/UploadToGallery.ipynb index 0219ba47..c671482c 100644 --- a/doc/source/user_guide/UploadToGallery.ipynb +++ b/doc/source/user_guide/UploadToGallery.ipynb @@ -4,7 +4,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "# Upload of a product to the gallery (oda api v1.2.24)\n", + "# Upload of a product to the gallery (oda api v1.2.25-dev0)\n", "\n", "This notebooks documents the functionality for uploading a data product over the data-product gallery.\n", "\n", diff --git a/oda_api/pkg_info.json b/oda_api/pkg_info.json index 29f1a8d7..6383f97f 100644 --- a/oda_api/pkg_info.json +++ b/oda_api/pkg_info.json @@ -1 +1 @@ -{"version": "1.2.24"} +{"version": "1.2.25-dev0"} diff --git a/setup.cfg b/setup.cfg index c4aef3b5..fc3445c4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.2.24 +current_version = 1.2.25-dev0 commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+)(?P\d+))? From 029c691a777aebddceb565a2fba9071bd2916973 Mon Sep 17 00:00:00 2001 From: ODA Release Bot Date: Fri, 16 Aug 2024 08:41:56 +0000 Subject: [PATCH 7/9] =?UTF-8?q?Bump=20version:=201.2.25-dev0=20=E2=86=92?= =?UTF-8?q?=201.2.25?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/source/install.rst | 2 +- doc/source/user_guide/TestAPI.ipynb | 4 ++-- doc/source/user_guide/UploadToGallery.ipynb | 2 +- oda_api/pkg_info.json | 2 +- setup.cfg | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/source/install.rst b/doc/source/install.rst index 46ed4dfa..a42527a3 100644 --- a/doc/source/install.rst +++ b/doc/source/install.rst @@ -19,7 +19,7 @@ Development version Download code and contribute ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Source code can be found can be found on github https://github.com/oda-hub/oda_api (see https://github.com/oda-hub/oda_api/archive/refs/tags/v1.2.25-dev0.tar.gz for latest release bundle). +Source code can be found can be found on github https://github.com/oda-hub/oda_api (see https://github.com/oda-hub/oda_api/archive/refs/tags/v1.2.25.tar.gz for latest release bundle). To contribute, please feel free to fork the repository, apply your changes, and prepare a pull request. diff --git a/doc/source/user_guide/TestAPI.ipynb b/doc/source/user_guide/TestAPI.ipynb index 1005b8e3..180ef43b 100644 --- a/doc/source/user_guide/TestAPI.ipynb +++ b/doc/source/user_guide/TestAPI.ipynb @@ -4,7 +4,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "# Quick Start (oda api v1.2.25-dev0)" + "# Quick Start (oda api v1.2.25)" ] }, { @@ -1488,7 +1488,7 @@ " 'HDUCLAS2': 'TOTAL',\n", " 'HDUCLAS3': 'RATE',\n", " 'HDUCLASS': 'OGIP',\n", - " 'HDUVERS': '1.2.25-dev0',\n", + " 'HDUVERS': '1.2.25',\n", " 'INSTRUME': 'IBIS',\n", " 'ISDCLEVL': 'SPE',\n", " 'LONGSTRN': 'OGIP 1.0',\n", diff --git a/doc/source/user_guide/UploadToGallery.ipynb b/doc/source/user_guide/UploadToGallery.ipynb index c671482c..40010222 100644 --- a/doc/source/user_guide/UploadToGallery.ipynb +++ b/doc/source/user_guide/UploadToGallery.ipynb @@ -4,7 +4,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "# Upload of a product to the gallery (oda api v1.2.25-dev0)\n", + "# Upload of a product to the gallery (oda api v1.2.25)\n", "\n", "This notebooks documents the functionality for uploading a data product over the data-product gallery.\n", "\n", diff --git a/oda_api/pkg_info.json b/oda_api/pkg_info.json index 6383f97f..0d0a2c97 100644 --- a/oda_api/pkg_info.json +++ b/oda_api/pkg_info.json @@ -1 +1 @@ -{"version": "1.2.25-dev0"} +{"version": "1.2.25"} diff --git a/setup.cfg b/setup.cfg index fc3445c4..efa2536f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.2.25-dev0 +current_version = 1.2.25 commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+)(?P\d+))? From f109cfbd7b013d2ce63b2e65458ffe829772c693 Mon Sep 17 00:00:00 2001 From: Volodymyr Savchenko Date: Fri, 16 Aug 2024 10:48:39 +0200 Subject: [PATCH 8/9] automerge and approve --- .github/workflows/python-publish.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index cac9d2da..79cc3165 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -50,8 +50,10 @@ jobs: Bump version to ${{ steps.bump-version.outputs.new_version }} This PR was created automatically by the Bump version workflow. - - name: Enable Pull Request Automerge - run: gh pr merge --merge --auto ${{ steps.cpr.outputs.pull-request-number }} + - name: Enable Pull Request Automerge and Approve + run: | + gh pr merge --merge --auto ${{ steps.cpr.outputs.pull-request-number }} + gh pr review --approve ${{ steps.cpr.outputs.pull-request-number }} env: GH_TOKEN: ${{ secrets.BOT_SECRET }} From 79bb8bb04238d05a831e981701c3dcc8edfd9af7 Mon Sep 17 00:00:00 2001 From: Volodymyr Savchenko Date: Fri, 16 Aug 2024 10:54:05 +0200 Subject: [PATCH 9/9] add label --- .github/workflows/python-publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 79cc3165..f98aecef 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -52,6 +52,7 @@ jobs: - name: Enable Pull Request Automerge and Approve run: | + gh pr edit --add-label "test-live" ${{ steps.cpr.outputs.pull-request-number }} gh pr merge --merge --auto ${{ steps.cpr.outputs.pull-request-number }} gh pr review --approve ${{ steps.cpr.outputs.pull-request-number }} env: