Merge branch 'master' into 261-use-renku-secret-storage

oda-hub · Sep 3, 2024 · 4c13879 · 4c13879
2 parents 86ee6a3 + 02e47e3
commit 4c13879
Show file tree

Hide file tree

Showing 11 changed files with 69 additions and 37 deletions.
diff --git a/.github/workflows/prose.yml b/.github/workflows/prose.yml
@@ -6,7 +6,7 @@ jobs:
     name: runner / vale
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: errata-ai/vale-action@reviewdog
         env:
           # Required, set by GitHub actions automatically:
@@ -27,4 +27,4 @@ jobs:
 
           # Optional
           files: README.md
-
+
diff --git a/.github/workflows/python-package-live.yml b/.github/workflows/python-package-live.yml
@@ -25,7 +25,7 @@ jobs:
         python-version: ['3.9', '3.10']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -18,7 +18,7 @@ jobs:
         python-version: ['3.8', '3.9', '3.10', '3.11']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:

diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
     - master
-    - release-action
     # - main
 
 jobs:
@@ -13,37 +12,70 @@ jobs:
     if: "!contains(github.event.head_commit.message, 'Bump version')"
     runs-on: ubuntu-20.04
 
-    permissions:
+    permissions: write-all
       # Give the default GITHUB_TOKEN write permission to commit and push the
       # added or changed files to the repository.
-      contents: write
+      # contents: write
 
     steps:
-    - name: actions/checkout
-      uses: actions/checkout@v3
+    - name: checkout
+      uses: actions/checkout@v4
       with:
-        fetch-depth: 0
-        token: ${{ secrets.BOT_SECRET }}
-      #     persist-credentials: false
+        persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal access token.
+        fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository.
 
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install build bump2version
+        pip install bump2version
 
     - name: Bump version
+      id: bump-version
       run: |
         git config --global user.email "[email protected]"
         git config --global user.name "ODA Release Bot"
         bump2version patch --verbose --commit --tag
         bump2version release --verbose --commit --tag
-
-    - name: Push changes
-      uses: ad-m/github-push-action@master
+        echo "::set-output name=new_version::$(git describe --tags --abbrev=0)"
+        
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@v6
+      id: cpr
       with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        branch: ${{ github.ref }}
+        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:
+    name: Publish new package version
+    if: "contains(github.event.head_commit.message, 'Bump version')"
+    runs-on: ubuntu-20.04
+
+    steps:
+    - name: checkout
+      uses: actions/checkout@v4
+      with:
+        persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal access token.
+        fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository.
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install build
+
     - name: Build package
       run: python -m build
 

diff --git 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)
 
 

diff --git 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.21.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.26.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
@@ -4,7 +4,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "# Quick Start (oda api v1.2.21)"
+    "# Quick Start (oda api v1.2.26)"
    ]
   },
   {
@@ -1488,7 +1488,7 @@
        " 'HDUCLAS2': 'TOTAL',\n",
        " 'HDUCLAS3': 'RATE',\n",
        " 'HDUCLASS': 'OGIP',\n",
-       " 'HDUVERS': '1.2.21',\n",
+       " 'HDUVERS': '1.2.26',\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
@@ -4,7 +4,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "# Upload of a product to the gallery (oda api v1.2.21)\n",
+    "# Upload of a product to the gallery (oda api v1.2.26)\n",
     "\n",
     "This notebooks documents the functionality for uploading a data product over the data-product gallery.\n",
     "\n",

diff --git a/oda_api/gallery_api.py b/oda_api/gallery_api.py
@@ -176,12 +176,12 @@ def get_list_images_with_conditions(self,
             rev2_value = self.get_revnum(t2, token)
 
         return self.get_list_products_with_conditions(token=token,
-                                                              instrument_name=instrument,
-                                                              product_type='image',
-                                                              e1_kev=e1_kev,
-                                                              e2_kev=e2_kev,
-                                                              rev1_value=rev1_value,
-                                                              rev2_value=rev2_value)
+                                                      instrument_name=instrument,
+                                                      product_type='image',
+                                                      e1_kev_value=e1_kev,
+                                                      e2_kev_value=e2_kev,
+                                                      rev1_value=rev1_value,
+                                                      rev2_value=rev2_value)
 
 
     def get_list_lightcurve_with_conditions(self,
@@ -347,7 +347,7 @@ def update_source_with_name(self,
         logger.info(posting_msg)
 
         res = requests.post(os.path.join(self.url, "post_astro_entity_to_gallery"),
-                            params={**params},
+                            data=params,
                             )
         response_json = self._decode_res_json(res)
 
@@ -416,7 +416,7 @@ def update_observation_with_title(self,
         logger.info(posting_msg)
 
         res = requests.post(os.path.join(self.url, "post_observation_to_gallery"),
-                            params={**params},
+                            data=params,
                             files=files_obj
                             )
         response_json = self._decode_res_json(res)
@@ -483,7 +483,7 @@ def post_observation_to_gallery(self,
         logger.info(posting_msg)
 
         res = requests.post(os.path.join(self.url, "post_observation_to_gallery"),
-                            params={**params},
+                            data=params,
                             files=files_obj
                             )
 
@@ -535,7 +535,7 @@ def delete_data_product_from_gallery_via_product_id(self,
         logger.info(posting_msg)
 
         res = requests.post("%s/delete_product_to_gallery" % self.url,
-                            params={**params}
+                            data=params
                             )
 
         if res.status_code != 200:
@@ -787,7 +787,7 @@ def post_data_product_to_gallery(self,
         logger.info(posting_msg)
 
         res = requests.post("%s/post_product_to_gallery" % self.url,
-                            params={**params},
+                            data=params,
                             files=files_obj
                             )
 

diff --git a/oda_api/pkg_info.json b/oda_api/pkg_info.json
@@ -1 +1 @@
-{"version": "1.2.21"}
+{"version": "1.2.26"}
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.2.21
+current_version = 1.2.26
 commit = True
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<build>\d+))?