Merge pull request #163 from A-Baji/py-ver-matrix

add py 3.9 to release matrix

Author: jverswijver

.github/workflows/development.yaml

@@ -31,7 +31,7 @@ jobs:
     env:
       DOCKER_CLIENT_TIMEOUT: "120"
       COMPOSE_HTTP_TIMEOUT: "120"
-      PY_VER: "3.8"
+      PY_VER: "3.9"
       IMAGE: "djtest"
       DISTRO: "alpine"
     steps:
@@ -57,6 +57,9 @@ jobs:
           - py_ver: 3.8
             distro: alpine
             image: djbase
+          - py_ver: 3.9
+            distro: alpine
+            image: djbase
     env:
       PY_VER: ${{matrix.py_ver}}
       DISTRO: ${{matrix.distro}}
@@ -83,11 +86,10 @@ jobs:
           path: "image-pharus-${{env.PHARUS_VERSION}}-py${{matrix.py_ver}}-\
             ${{matrix.distro}}.tar.gz"
           retention-days: 1
-      - if: matrix.py_ver == '3.8' && matrix.distro == 'alpine'
-        name: Add pip artifacts
+      - name: Add pip artifacts
         uses: actions/upload-artifact@v2
         with:
-          name: pip-pharus-${{env.PHARUS_VERSION}}
+          name: pip-pharus-${{env.PHARUS_VERSION}}-py${{matrix.py_ver}}
           path: dist
           retention-days: 1
   test:
@@ -99,6 +101,9 @@ jobs:
           - py_ver: 3.8
             distro: alpine
             image: djbase
+          - py_ver: 3.9
+            distro: alpine
+            image: djbase
     env:
       PY_VER: ${{matrix.py_ver}}
       DISTRO: ${{matrix.distro}}
@@ -164,10 +169,15 @@ jobs:
         uses: actions/download-artifact@v2
         with:
           name: image-pharus-${{env.PHARUS_VERSION}}-py3.8-alpine
-      - name: Fetch pip artifacts
+      - name: Fetch 3.8 pip artifacts
+        uses: actions/download-artifact@v2
+        with:
+          name: pip-pharus-${{env.PHARUS_VERSION}}-py3.8
+          path: dist
+      - name: Fetch 3.9 pip artifacts
         uses: actions/download-artifact@v2
         with:
-          name: pip-pharus-${{env.PHARUS_VERSION}}
+          name: pip-pharus-${{env.PHARUS_VERSION}}-py3.8
           path: dist
       - name: Publish pip release
         run: |
@@ -180,23 +190,41 @@ jobs:
         run: |
           echo "PHARUS_WHEEL_PATH=$(ls dist/pharus-*.whl)" >> $GITHUB_ENV
           echo "PHARUS_SDIST_PATH=$(ls dist/pharus-*.tar.gz)" >> $GITHUB_ENV
-      - name: Upload pip wheel asset to release
+      - name: Upload 3.8 pip wheel asset to release
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
         with:
           upload_url: ${{steps.create_gh_release.outputs.upload_url}}
           asset_path: ${{env.PHARUS_WHEEL_PATH}}
-          asset_name: pip-pharus-${{env.PHARUS_VERSION}}.whl
+          asset_name: pip-pharus-${{env.PHARUS_VERSION}}-py3.8.whl
           asset_content_type: application/zip
-      - name: Upload pip sdist asset to release
+      - name: Upload 3.9 pip wheel asset to release
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+        with:
+          upload_url: ${{steps.create_gh_release.outputs.upload_url}}
+          asset_path: ${{env.PHARUS_WHEEL_PATH}}
+          asset_name: pip-pharus-${{env.PHARUS_VERSION}}-py3.9.whl
+          asset_content_type: application/zip
+      - name: Upload 3.8 pip sdist asset to release
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
         with:
           upload_url: ${{steps.create_gh_release.outputs.upload_url}}
           asset_path: ${{env.PHARUS_SDIST_PATH}}
-          asset_name: pip-pharus-${{env.PHARUS_VERSION}}.tar.gz
+          asset_name: pip-pharus-${{env.PHARUS_VERSION}}-py3.8.tar.gz
+          asset_content_type: application/gzip
+      - name: Upload 3.9 pip sdist asset to release
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+        with:
+          upload_url: ${{steps.create_gh_release.outputs.upload_url}}
+          asset_path: ${{env.PHARUS_SDIST_PATH}}
+          asset_name: pip-pharus-${{env.PHARUS_VERSION}}-py3.9.tar.gz
           asset_content_type: application/gzip
       - name: Upload deploy docker environment
         uses: actions/upload-release-asset@v1
@@ -224,6 +252,9 @@ jobs:
           - py_ver: 3.8
             distro: alpine
             image: djbase
+          - py_ver: 3.9
+            distro: alpine
+            image: djbase
     env:
       PY_VER: ${{matrix.py_ver}}
       DISTRO: ${{matrix.distro}}
@@ -248,10 +279,12 @@ jobs:
           docker load < "image-pharus-${PHARUS_VERSION}-py${PY_VER}-${DISTRO}.tar.gz"
           IMAGE=$(docker images --filter "reference=datajoint/*" --format "{{.Repository}}")
           TAG=$(docker images --filter "reference=datajoint/*" --format "{{.Tag}}")
-          docker push "${IMAGE}:${TAG}"
-          docker tag "${IMAGE}:${TAG}" "${IMAGE}:${TAG}-${GITHUB_SHA:0:7}"
-          docker push "${IMAGE}:${TAG}-${GITHUB_SHA:0:7}"
-          [ "$PY_VER" == "3.8" ] && [ "$DISTRO" == "alpine" ] \
+          docker tag "${IMAGE}:${TAG}" "${IMAGE}:${TAG}-py${PY_VER}"
+          docker push "${IMAGE}:${TAG}-py${PY_VER}"
+          docker tag "${IMAGE}:${TAG}" "${IMAGE}:${TAG}-py${PY_VER}-${GITHUB_SHA:0:7}"
+          docker push "${IMAGE}:${TAG}-py${PY_VER}-${GITHUB_SHA:0:7}"
+          [ "$PY_VER" == "3.9" ] && [ "$DISTRO" == "alpine" ] \
+                  && docker push "${IMAGE}:${TAG}" \
                   && docker tag "${IMAGE}:${TAG}" "${IMAGE}:latest" \
                   && docker push "${IMAGE}:latest" \
               || echo "skipping 'latest' tag..."

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention.
 
+## [0.8.6] - 2023-05-2
+
+### Added
+
+- Added python 3.9 to release matrix [#163](https://github.com/datajoint/pharus/pull/163)
+
 ## [0.8.5] - 2023-04-26
 
 ### Added
@@ -302,6 +308,7 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
 - Support for DataJoint attribute types: `varchar`, `int`, `float`, `datetime`, `date`, `time`, `decimal`, `uuid`.
 - Check dependency utility to determine child table references.
 
+[0.8.6]: https://github.com/datajoint/pharus/compare/0.8.5...0.8.6
 [0.8.5]: https://github.com/datajoint/pharus/compare/0.8.4...0.8.5
 [0.8.4]: https://github.com/datajoint/pharus/compare/0.8.3...0.8.4
 [0.8.3]: https://github.com/datajoint/pharus/compare/0.8.2...0.8.3

docker-compose-build.yaml

@@ -1,4 +1,4 @@
-# PY_VER=3.8 IMAGE=djbase DISTRO=alpine PHARUS_VERSION=$(cat pharus/version.py | grep -oP '\d+\.\d+\.\d+') HOST_UID=$(id -u) docker compose -f docker-compose-build.yaml up --exit-code-from pharus --build
+# PY_VER=3.9 IMAGE=djbase DISTRO=alpine PHARUS_VERSION=$(cat pharus/version.py | grep -oP '\d+\.\d+\.\d+') HOST_UID=$(id -u) docker compose -f docker-compose-build.yaml up --exit-code-from pharus --build
 #
 # Intended for updating dependencies and docker image.
 # Used to build release artifacts.

docker-compose-dev.yaml

@@ -1,4 +1,4 @@
-# PY_VER=3.8 IMAGE=djbase DISTRO=alpine PHARUS_VERSION=$(cat pharus/version.py | grep -oP '\d+\.\d+\.\d+') HOST_UID=$(id -u) docker compose -f docker-compose-dev.yaml up
+# PY_VER=3.9 IMAGE=djbase DISTRO=alpine PHARUS_VERSION=$(cat pharus/version.py | grep -oP '\d+\.\d+\.\d+') HOST_UID=$(id -u) docker compose -f docker-compose-dev.yaml up
 #
 # Intended for normal development. Supports hot/live reloading.
 # Note: If requirements or Dockerfile change, will need to add --build flag to docker-compose.
@@ -36,7 +36,7 @@ services:
       - PHARUS_OIDC_PUBLIC_KEY
       - PHARUS_OIDC_SUBJECT_KEY=preferred_username
     volumes:
-      - ./pharus:/opt/conda/lib/python3.8/site-packages/pharus
+      - ./pharus:/opt/conda/lib/python${PY_VER}/site-packages/pharus
     command: pharus
   fakeservices.datajoint.io:
     <<: *net

docker-compose-docs.yaml

@@ -1,4 +1,4 @@
-# PY_VER=3.8 IMAGE=djtest DISTRO=alpine HOST_UID=$(id -u) docker-compose -f docker-compose-docs.yaml up --exit-code-from pharus-docs --build
+# PY_VER=3.9 IMAGE=djtest DISTRO=alpine HOST_UID=$(id -u) docker-compose -f docker-compose-docs.yaml up --exit-code-from pharus-docs --build
 #
 # Used to build documentation artifacts.
 version: "2.4"

docker-compose-test.yaml

@@ -1,4 +1,4 @@
-# PY_VER=3.8 IMAGE=djtest DISTRO=alpine AS_SCRIPT=FALSE PHARUS_VERSION=$(cat pharus/version.py | grep -oP '\d+\.\d+\.\d+') HOST_UID=$(id -u) docker compose -f docker-compose-test.yaml up --exit-code-from pharus
+# PY_VER=3.9 IMAGE=djtest DISTRO=alpine AS_SCRIPT=FALSE PHARUS_VERSION=$(cat pharus/version.py | grep -oP '\d+\.\d+\.\d+') HOST_UID=$(id -u) docker compose -f docker-compose-test.yaml up --exit-code-from pharus
 #
 # Intended for running test suite locally.
 # Note: If requirements or Dockerfile change, will need to add --build flag.
@@ -27,15 +27,15 @@ services:
       - PHARUS_SPEC_PATH=tests/init/test_dynamic_api_spec.yaml
     volumes:
       - ./requirements_test.txt:/tmp/pip_requirements.txt
-      - ./pharus:/opt/conda/lib/python3.8/site-packages/pharus
+      - ./pharus:/opt/conda/lib/python${PY_VER}/site-packages/pharus
     command:
       - sh
       - -c
       - |
         set -e
         if echo "${AS_SCRIPT}" | grep -i true &>/dev/null; then
           echo "------ SYNTAX TESTS ------"
-          PKG_DIR=/opt/conda/lib/python3.8/site-packages/pharus
+          PKG_DIR=/opt/conda/lib/python${PY_VER}/site-packages/pharus
           flake8 $${PKG_DIR} --count --select=E9,F63,F7,F82 --show-source --statistics
           flake8 /main/tests --count --select=E9,F63,F7,F82 --show-source --statistics
           echo "------ UNIT TESTS ------"

pharus/version.py

@@ -1,2 +1,2 @@
 """Package metadata."""
-__version__ = "0.8.5"
+__version__ = "0.8.6"