Merge pull request #402 from djhoese/ci-remove-py36

Remove unsupported Python 3.6 from wheel building
pytroll · Dec 3, 2021 · 0b35d70 · 0b35d70
2 parents 04a68f9 + bb0f3da
commit 0b35d70
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,4 +1,9 @@
 name: CI
+# https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#concurrency
+# https://docs.github.com/en/developers/webhooks-and-events/events/github-event-types#pullrequestevent
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.number }}-${{ github.event.type }}
+  cancel-in-progress: true
 
 on: [push, pull_request]
 

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -1,12 +1,11 @@
 name: Deploy sdist and wheels
+# https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#concurrency
+# https://docs.github.com/en/developers/webhooks-and-events/events/github-event-types#pullrequestevent
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.number }}-${{ github.event.type }}
+  cancel-in-progress: true
 
-on:
-  push:
-    tags:
-      - v*
-  release:
-    types:
-      - published
+on: [push, pull_request, release]
 
 jobs:
   build_sdist:
@@ -34,17 +33,17 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, macos-latest]
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: ['3.7', '3.8', '3.9', '3.10']
         include:
           # Using pythons inside a docker image to provide all the Linux
           # python-versions permutations.
           - name: manylinux 64-bit
             os: ubuntu-latest
-            python-version: 3.8
+            python-version: '3.8'
             docker-image: manylinux1_x86_64
           - name: manylinux 32-bit
             os: ubuntu-latest
-            python-version: 3.8
+            python-version: '3.8'
             docker-image: manylinux1_i686
 
     steps:
@@ -55,7 +54,7 @@ jobs:
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v1
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: '${{ matrix.python-version }}'
 
       - name: Install dependencies
         run: |
@@ -94,6 +93,8 @@ jobs:
   upload_test_pypi:
     needs: [build_sdist, build_wheels]
     runs-on: ubuntu-latest
+    # upload to Test PyPI for every commit on main branch
+    if: github.event_name == 'push' && github.event.ref == 'refs/heads/main'
     steps:
       - name: Download sdist artifact
         uses: actions/download-artifact@v2