Merge branch 'add-py37-nw-image' into develop

praekeltfoundation · Nov 23, 2023 · d298c3e · d298c3e
2 parents d3fd6ef + e9f31ab
commit d298c3e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 62 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -7,72 +7,13 @@ on:
     branches:
       - develop
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - python_version: "3.8"
-            variant: buster
-            test_project: django2
-          - python_version: "3.9"
-            variant: buster
-            test_project: django2
-    env:
-      TAG: py${{ matrix.python_version }}-${{ matrix.variant }}
-      IMAGE: praekeltfoundation/django-bootstrap:py${{ matrix.python_version }}-${{ matrix.variant }}
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        with:
-          python-version: 3.9
-      - name: run tests
-        run: |
-          docker build --pull --cache-from "$IMAGE" --build-arg PYTHON_VERSION="${{matrix.python_version}}-${{matrix.variant}}" --tag "$IMAGE" .
-          docker build -t "mysite:$TAG" --build-arg BASE_IMAGE="$IMAGE" --build-arg PROJECT="${{matrix.test_project}}" tests
-          pip install -r tests/requirements.txt
-          pytest -v tests/test.py --django-bootstrap-image="mysite:$TAG"
-          flake8 gunicorn/config.py
-          cd tests; flake8
-      - uses: docker/setup-buildx-action@v2
-      - name: construct image metadata
-        uses: docker/metadata-action@v4
-        id: meta
-        with:
-          images: |
-            praekeltfoundation/django-bootstrap
-            ghcr.io/praekeltfoundation/docker-django-bootstrap
-          tags: |
-            type=pep440,pattern=py{{major}},value=${{matrix.python_version}}
-            type=raw,value=py${{matrix.python_version}}
-            type=raw,value=${{matrix.variant}}
-            type=pep440,pattern=py{{major}}-${{matrix.variant}},value=${{matrix.python_version}}
-            type=raw,value=py${{matrix.python_version}}-${{matrix.variant}}
-      - name: login to ghcr
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{github.actor}}
-          password: ${{secrets.GITHUB_TOKEN}}
-      - name: login to docker hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{secrets.DOCKER_USERNAME}}
-          password: ${{secrets.DOCKER_PASSWORD}}
-      - name: build and push
-        uses: docker/build-push-action@v4
-        with:
-          push: ${{github.event_name != 'pull_request'}}
-          tags: ${{steps.meta.outputs.tags}}
-          build-args: |
-            PYTHON_VERSION=${{matrix.python_version}}-${{matrix.variant}}
-
   build-no-wheelhouse:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        python_version: ["3.10", "3.9", "3.8"]
-        variant: [buster, bullseye]
+        python_version: ["3.10", "3.9", "3.8", "3.7"]
+        variant: [bullseye]
         test_project: [django2]
     env:
       TAG: py${{ matrix.python_version }}-${{ matrix.variant }}

diff --git a/tests/django2/setup.py b/tests/django2/setup.py
@@ -14,5 +14,7 @@
         'django-health-check',
         'django-prometheus <2.3',
         'psycopg2-binary >=2.7',
+        # For compat with older celery in Python 3.7
+        'importlib_metadata < 5.0',
     ],
 )