Merge pull request #116 from XAITK/update-to-v0.6.1

Update to v0.6.1

.github/workflows/ci-example-notebooks.yml

@@ -6,11 +6,12 @@ on:
   push:
     branches:
       - master
-      - release*
+      - release
   pull_request:
     branches:
       - master
-      - release*
+      - release
+      - update-to-v*
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

.github/workflows/ci-unittests.yml

@@ -8,11 +8,12 @@ on:
   push:
     branches:
       - master
-      - release*
+      - release
   pull_request:
     branches:
       - master
-      - release*
+      - release
+      - update-to-v*
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

.github/workflows/publish.yml

@@ -1,14 +1,62 @@
-# Re-use the publishing workflow from smqtk-core
 name: Publish
 
+# Controls when the action will run.
 on:
   push:
     tags:
       # Only run on tags with official version tag release format (e.g. v1.0.1)
       - "v[0-9].[0-9]+.[0-9]+"
 
-jobs:
-  reuse-core-publish:
-    uses: Kitware/SMQTK-Core/.github/workflows/publish.yml@master
+  # Allow use of this workflow as a reusable workflow.
+  # https://docs.github.com/en/actions/learn-github-actions/reusing-workflows
+  workflow_call:
     secrets:
-      PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
+      PYPI_TOKEN:
+        required: true
+
+defaults:
+  run:
+    shell: bash
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    container: python:3.7
+    # This should only be run for tags on the "official" repository org.
+    if: github.repository_owner == 'XAITK'
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      # Cache local python environment artifacts for the current python version
+      # and poetry lockfile hash.
+      - uses: actions/cache@v2
+        id: env-cache
+        with:
+          # Confirmed that the `.local` directory doesn't exist until the
+          # `pip install --user` is invoked below, so we can be confident that
+          # only our python stuff is being captured in this cache (intentional).
+          path: |
+            ~/.cache/pypoetry/virtualenvs/
+            ~/.local
+          key: python-3.7-${{ hashFiles('poetry.lock') }}
+
+      - name: Setup Environment
+        # Using non-relative path for correct behavior when used as a remote
+        # workflow.
+        uses: Kitware/SMQTK-Core/.github/actions/python-poetry-setup@master
+
+      - name: Publish
+        env:
+          POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}
+        run: |
+          if [[ -z "$POETRY_PYPI_TOKEN_PYPI" ]]
+          then
+            echo "ERROR: Input pypi token was blank. Did you forget to set the appropriate secret?"
+            exit 1
+          fi
+          echo "Publishing new tag: ${{ github.ref_name }}"
+          git checkout ${{ github.ref_name }}
+          poetry publish --build

docs/release_notes.rst

@@ -10,3 +10,4 @@ Release Notes
    release_notes/v0.4.0
    release_notes/v0.5.0
    release_notes/v0.6.0
+   release_notes/v0.6.1

docs/release_notes/v0.6.1.rst

@@ -0,0 +1,14 @@
+v0.6.1
+======
+This patch specializes the release CI workflow for this organization and
+repository as opposed to previously relying on the remote workflow.
+
+Fixes
+-----
+
+CI
+
+* Fix the publish workflow to use appropriate values and version for the
+  containing org and this repository.
+
+* Update CI workflows to also run for ``update-to-v*`` branches.

pyproject.toml

@@ -8,7 +8,7 @@ name = "xaitk_saliency"
 # REMEMBER: `distutils.version.*Version` types can be used to compare versions
 # from strings like this.
 # This package prefers to use the strict numbering standard when possible.
-version = "0.6.0"
+version = "0.6.1"
 description = """\
     Visual saliency map generation interfaces and baseline implementations \
     for explainable AI."""