Skip to content

Commit

Permalink
Merge branch 'master' into adapt-to-new-dummy-instrument
Browse files Browse the repository at this point in the history
burnout87 authored Nov 20, 2023
2 parents 8ecbae3 + d19cef3 commit 9151813
Showing 6 changed files with 20 additions and 40 deletions.
48 changes: 14 additions & 34 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
@@ -4,19 +4,26 @@ on:
push:
branches:
- master
- main
- ci
- release-action
# - main

jobs:
bump-version:
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
2 changes: 1 addition & 1 deletion doc/source/install.rst
Original file line number Diff line number Diff line change
@@ -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.tar.gz for latest release bundle).

To contribute, please feel free to fork the repository, apply your changes, and prepare a pull request.

4 changes: 2 additions & 2 deletions doc/source/user_guide/TestAPI.ipynb
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"# Quick Start (oda api v1.2.1)"
"# Quick Start (oda api v1.2.2)"
]
},
{
@@ -1488,7 +1488,7 @@
" 'HDUCLAS2': 'TOTAL',\n",
" 'HDUCLAS3': 'RATE',\n",
" 'HDUCLASS': 'OGIP',\n",
" 'HDUVERS': '1.2.1',\n",
" 'HDUVERS': '1.2.2',\n",
" 'INSTRUME': 'IBIS',\n",
" 'ISDCLEVL': 'SPE',\n",
" 'LONGSTRN': 'OGIP 1.0',\n",
2 changes: 1 addition & 1 deletion doc/source/user_guide/UploadToGallery.ipynb
Original file line number Diff line number Diff line change
@@ -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)\n",
"\n",
"This notebooks documents the functionality for uploading a data product over the data-product gallery.\n",
"\n",
2 changes: 1 addition & 1 deletion oda_api/pkg_info.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version": "1.2.1"}
{"version": "1.2.2"}
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.2.1
current_version = 1.2.2
commit = True
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<build>\d+))?

0 comments on commit 9151813

Please sign in to comment.