Merge branch 'master' into fixing-post-request-to-gallery

.github/workflows/python-publish.yml

@@ -39,12 +39,24 @@ 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"
         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 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:
+        GH_TOKEN: ${{ secrets.BOT_SECRET }}
 
 
   publish-version:

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)
 
 

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.tar.gz for latest release bundle).
 
 To contribute, please feel free to fork the repository, apply your changes, and prepare a pull request.
 

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)"
    ]
   },
   {
@@ -1488,7 +1488,7 @@
        " 'HDUCLAS2': 'TOTAL',\n",
        " 'HDUCLAS3': 'RATE',\n",
        " 'HDUCLASS': 'OGIP',\n",
-       " 'HDUVERS': '1.2.24',\n",
+       " 'HDUVERS': '1.2.25',\n",
        " 'INSTRUME': 'IBIS',\n",
        " 'ISDCLEVL': 'SPE',\n",
        " 'LONGSTRN': 'OGIP 1.0',\n",

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)\n",
     "\n",
     "This notebooks documents the functionality for uploading a data product over the data-product gallery.\n",
     "\n",

oda_api/pkg_info.json

@@ -1 +1 @@
-{"version": "1.2.24"}
+{"version": "1.2.25"}

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.2.24
+current_version = 1.2.25
 commit = True
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<build>\d+))?