From 24f57f06f4e2a4001eab3e1cb207f14c13435b7d Mon Sep 17 00:00:00 2001 From: David Hoese Date: Fri, 3 Dec 2021 11:57:23 -0600 Subject: [PATCH 1/7] Remove unsupported Python 3.6 from wheel building --- .github/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index d3feab260..ff078010a 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -34,7 +34,7 @@ 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. From 7bde1072c48a7416039c5e6507bdf87a79654161 Mon Sep 17 00:00:00 2001 From: David Hoese Date: Fri, 3 Dec 2021 12:02:12 -0600 Subject: [PATCH 2/7] Make deploy jobs run all the time --- .github/workflows/deploy.yaml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index ff078010a..37e29b415 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -1,12 +1,6 @@ name: Deploy sdist and wheels - -on: - push: - tags: - - v* - release: - types: - - published + +on: [push, pull_request, release] jobs: build_sdist: @@ -94,6 +88,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 From d030b402203d75b44e27dfb19038cd783545183e Mon Sep 17 00:00:00 2001 From: David Hoese Date: Fri, 3 Dec 2021 12:04:44 -0600 Subject: [PATCH 3/7] Fix trailing space --- .github/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 37e29b415..322f43b66 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -1,5 +1,5 @@ name: Deploy sdist and wheels - + on: [push, pull_request, release] jobs: From 6fcfcda3f1d3931f2be78ebf75b1a3ef8cbbe33f Mon Sep 17 00:00:00 2001 From: David Hoese Date: Fri, 3 Dec 2021 12:08:35 -0600 Subject: [PATCH 4/7] Add concurrency handling to CI --- .github/workflows/ci.yaml | 5 +++++ .github/workflows/deploy.yaml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index cfe925eb7..6a0d6bf8c 100644 --- 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 index 322f43b66..00d34194c 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -1,4 +1,9 @@ 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, pull_request, release] From 8916d3008096d61a9a5735717e3bef82cf3e041b Mon Sep 17 00:00:00 2001 From: David Hoese Date: Fri, 3 Dec 2021 12:20:50 -0600 Subject: [PATCH 5/7] Fix deploy to put python version in a string --- .github/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 00d34194c..b64251458 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -54,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: | From 1e0966ee80f2b40928b81216be7c0b4c514b913d Mon Sep 17 00:00:00 2001 From: David Hoese Date: Fri, 3 Dec 2021 12:25:52 -0600 Subject: [PATCH 6/7] Fix deploy to put python version in a string --- .github/workflows/deploy.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index b64251458..7bc498590 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -33,17 +33,17 @@ jobs: fail-fast: false matrix: os: [windows-latest, macos-latest] - python-version: [3.7, 3.8, 3.9, 3.10] + 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: @@ -54,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: | From bb0f3daa6fd27b90cf913a7bbde84744bd858096 Mon Sep 17 00:00:00 2001 From: David Hoese Date: Fri, 3 Dec 2021 12:29:35 -0600 Subject: [PATCH 7/7] Fix deploy to put python version in a string --- .github/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 7bc498590..c5163fb2c 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -54,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: |