From 4dd5f0bf8122bf6fbdc9a32967cdd7027f9318e7 Mon Sep 17 00:00:00 2001 From: Volodymyr Savchenko Date: Fri, 17 Nov 2023 18:57:23 +0100 Subject: [PATCH 1/3] try yet different workflow --- .github/workflows/python-publish.yml | 48 ++++++++-------------------- 1 file changed, 14 insertions(+), 34 deletions(-) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 21db771b..92529da4 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -4,8 +4,7 @@ on: push: branches: - master - - main - - ci + - release-action # - main jobs: @@ -13,10 +12,18 @@ jobs: name: Bump package version if: "!contains(github.event.head_commit.message, 'Bump version')" runs-on: ubuntu-20.04 + + permissions: + # Give the default GITHUB_TOKEN write permission to commit and push the + # added or changed files to the repository. + contents: write + steps: - name: actions/checkout - uses: actions/checkout@v2 - # with: + uses: actions/checkout@v3 + with: + fetch-depth: 0 + token: ${{ secrets.BOT_SECRET }} # persist-credentials: false - name: Install dependencies @@ -34,13 +41,9 @@ jobs: - name: Push changes uses: ad-m/github-push-action@master with: - github_token: ${{ secrets.BOT_SECRET }} - branch: ${{ github.ref }} - # force: true - tags: true - - # - uses: stefanzweifel/git-auto-commit-action@v4 - + github_token: ${{ secrets.GITHUB_TOKEN }} + branch: ${{ github.ref }} + - name: Build package run: python -m build @@ -50,26 +53,3 @@ jobs: user: __token__ verify_metadata: false password: ${{ secrets.PYPI_API_TOKEN }} - - #TODO: #211 fix this - # - name: Conda publish - # uses: silvxlabs/conda-skeleton-publish@v2 - # with: - # # Name of PyPI package - # pypi_package: oda-api # optional - # # Package version on PyPi - # #package_version: # optional, default is latest - # # Python version to build - # #python_version: # optional - # # Conda channels to use for building package - # build_channels: conda-forge - # # Conda channel to upload to - # upload_channel: mmoda# optional - # # Anaconda client access token - # access_token: ${{ secrets.CONDA_ACCESS_TOKEN }} - # # Platforms to publish - # #platforms: # optional, default is win-64 osx-64 osx-arm64 linux-64 linux-aarch64 - # # Set this to true if this is a stable release. Passese a `-l beta` arg if false. - # #stable: # optional - # # If true, waits for the PyPi package to become available. - # wait: true # optional From 3faa776cd163e7a657d1fe14e007cdbbf3938ead Mon Sep 17 00:00:00 2001 From: ODA Release Bot Date: Fri, 17 Nov 2023 17:58:02 +0000 Subject: [PATCH 2/3] =?UTF-8?q?Bump=20version:=201.2.1=20=E2=86=92=201.2.2?= =?UTF-8?q?-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 d958faed..d6452a9d 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.1.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.2-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 3e1184b5..3c99c3bc 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.1)" + "# Quick Start (oda api v1.2.2-dev0)" ] }, { @@ -1488,7 +1488,7 @@ " 'HDUCLAS2': 'TOTAL',\n", " 'HDUCLAS3': 'RATE',\n", " 'HDUCLASS': 'OGIP',\n", - " 'HDUVERS': '1.2.1',\n", + " 'HDUVERS': '1.2.2-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 9976abdc..aa17ccc1 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.1)\n", + "# Upload of a product to the gallery (oda api v1.2.2-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 5d6fcfcf..2c232576 100644 --- a/oda_api/pkg_info.json +++ b/oda_api/pkg_info.json @@ -1 +1 @@ -{"version": "1.2.1"} +{"version": "1.2.2-dev0"} diff --git a/setup.cfg b/setup.cfg index c7fcff42..a0f13791 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.2.1 +current_version = 1.2.2-dev0 commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+)(?P\d+))? From d19cef3df9d748f37316cf313cd03f6a60de11e6 Mon Sep 17 00:00:00 2001 From: ODA Release Bot Date: Fri, 17 Nov 2023 17:58:02 +0000 Subject: [PATCH 3/3] =?UTF-8?q?Bump=20version:=201.2.2-dev0=20=E2=86=92=20?= =?UTF-8?q?1.2.2?= 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 d6452a9d..773b74f8 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.2-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.2.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 3c99c3bc..c06201f3 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.2-dev0)" + "# Quick Start (oda api v1.2.2)" ] }, { @@ -1488,7 +1488,7 @@ " 'HDUCLAS2': 'TOTAL',\n", " 'HDUCLAS3': 'RATE',\n", " 'HDUCLASS': 'OGIP',\n", - " 'HDUVERS': '1.2.2-dev0',\n", + " 'HDUVERS': '1.2.2',\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 aa17ccc1..c1c20090 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.2-dev0)\n", + "# Upload of a product to the gallery (oda api v1.2.2)\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 2c232576..72ff70e5 100644 --- a/oda_api/pkg_info.json +++ b/oda_api/pkg_info.json @@ -1 +1 @@ -{"version": "1.2.2-dev0"} +{"version": "1.2.2"} diff --git a/setup.cfg b/setup.cfg index a0f13791..a6e65c9b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.2.2-dev0 +current_version = 1.2.2 commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+)(?P\d+))?