Merge pull request #28 from nansencenter/multi_python_versions

Support multiple python versions
nansencenter · Dec 13, 2023 · 28c6e09 · 28c6e09
2 parents 9845e95 + 3c4116a
commit 28c6e09
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 17 deletions.
diff --git a/.github/workflows/tests_and_build.yml → .github/workflows/ci.yml b/.github/workflows/tests_and_build.yml → .github/workflows/ci.yml
@@ -1,18 +1,32 @@
 ---
 name: "Unit tests and builds"
-on: push
+on:
+  push:
+    branches: ['**']
+  release:
+    types: [prereleased, released]
 env:
   TESTING_IMAGE_NAME: geospaas_rest_api_tests
   GEOSPAAS_PROCESSING_VERSION: 3.1.0
   GEOSPAAS_HARVESTING_VERSION: 3.8.0
   METANORM_VERSION: 4.1.2
 jobs:
-  tests_build:
+  tests:
     name: Run unit tests and build package
-    runs-on: 'ubuntu-20.04'
+    runs-on: 'ubuntu-latest'
+    env:
+      latest: ${{ matrix.python_version == '3.11' && 'true' || '' }}
+    strategy:
+      matrix:
+        python_version:
+          - '3.7'
+          - '3.8'
+          - '3.9'
+          - '3.10'
+          - '3.11'
     steps:
       - name: 'Checkout repository'
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -40,6 +54,7 @@ jobs:
           load: true
           tags: ${{ env.TESTING_IMAGE_NAME }}
           build-args: |
+            BASE_IMAGE=${{ vars.DOCKER_ORG }}/geospaas:latest-python${{ matrix.python_version }}
             GEOSPAAS_PROCESSING_VERSION=${{ env.GEOSPAAS_PROCESSING_VERSION }}
             GEOSPAAS_HARVESTING_VERSION=${{ env.GEOSPAAS_HARVESTING_VERSION }}
             METANORM_VERSION=${{ env.METANORM_VERSION }}
@@ -72,31 +87,42 @@ jobs:
              --omit='geospaas_rest_api/tests/*'
              runtests.py"
 
-      - name: 'Install Python 3.7'
-        uses: actions/setup-python@v2
+      - name: 'Install Python 3.11'
+        if: ${{ env.latest }}
+        uses: actions/setup-python@v4
         with:
-          python-version: '3.7'
+          python-version: '3.11'
 
       - name: 'Upload coverage to coveralls.io'
+        if: ${{ env.latest }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: pip install coveralls && coveralls --service=github
 
+
+  publish_python_package:
+    name: Build Python package and publish it as a release artifact
+    runs-on: 'ubuntu-latest'
+    needs: 'tests'
+    if: ${{ github.event_name == 'release' }}
+    steps:
+      - name: 'Checkout repository'
+        uses: actions/checkout@v4
+
+      - name: 'Install Python 3.11'
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+
       - name: 'Build Python package'
-        if: startsWith(github.event.ref, 'refs/tags/')
         env:
-          TAG_REF: ${{ github.ref }}
+          GEOSPAAS_REST_API_RELEASE: ${{ github.ref_name }}
         run: >
-             docker run --rm
-             -v "$(pwd):/src"
-             -e "GEOSPAAS_REST_API_RELEASE=${TAG_REF#refs/tags/}"
-             "${TESTING_IMAGE_NAME}"
-             python setup.py sdist bdist_wheel
+          pip install wheel &&
+          python setup.py sdist bdist_wheel
 
       - name: 'Deploy package to the Github release'
-        if: startsWith(github.event.ref, 'refs/tags/')
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_REPOSITORY: ${{ github.repository }}
         uses: svenstaro/upload-release-action@v2
         with:

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,5 @@
-FROM nansencenter/geospaas:latest-slim
+ARG BASE_IMAGE=nansencenter/geospaas:latest
+FROM ${BASE_IMAGE}
 LABEL purpose="Environment for REST API for Django-Geo-SpaaS"
 
 ARG GEOSPAAS_PROCESSING_VERSION