From 5eaaebdbecbdbed4b4edf0c40324b40fef6b9ccb Mon Sep 17 00:00:00 2001 From: AJ Friend Date: Fri, 11 Aug 2023 15:56:41 -1000 Subject: [PATCH 1/7] Drop cibuildwheel v1 and 3.5 tests --- .github/workflows/tests.yml | 4 +--- .github/workflows/wheels.yml | 40 +----------------------------------- 2 files changed, 2 insertions(+), 42 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2b25e0f9..f694e47b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,9 +14,7 @@ jobs: strategy: matrix: os: [macos-latest, windows-latest, ubuntu-20.04] - python-version: ['3.5', '3.6', '3.7', '3.8', '3.9', '3.10', '3.11'] - - os: windows-latest - python-version: 3.5 + python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11'] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 5bb7a32a..3181c6d8 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -56,44 +56,6 @@ jobs: with: path: ./dist - make_cibw_v1_wheels: - name: "cibuildwheel v1: ${{ matrix.name }}" - if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.draft }} - runs-on: ${{ matrix.os }} - strategy: - matrix: - # Only build for platforms that cibw v2 doesn't support - include: - - os: macos-latest - build: "cp27-macosx_x86_64" - name: macOS Intel - - os: ubuntu-20.04 - build: "cp27-manylinux_x86_64" - name: Linux Intel 64-bit - - steps: - - uses: actions/checkout@v3 - with: - submodules: recursive - - ## Build - - - uses: pypa/cibuildwheel@v1.12.0 - env: - CIBW_TEST_REQUIRES: pytest numpy - CIBW_TEST_COMMAND: pytest {project}/tests - CIBW_ARCHS_LINUX: auto aarch64 - CIBW_BUILD: ${{ matrix.build }} - - - name: Check with Twine - run: | - pipx run twine check wheelhouse/* - - - name: Upload artifacts to GitHub - uses: actions/upload-artifact@v3 - with: - path: wheelhouse/*.whl - make_cibw_v2_wheels: name: "cibuildwheel v2: ${{ matrix.name }}" if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.draft }} @@ -176,7 +138,7 @@ jobs: path: wheelhouse/*.whl upload_all: - needs: [make_sdist, make_cibw_v1_wheels, make_cibw_v2_wheels] + needs: [make_sdist, make_cibw_v2_wheels] runs-on: ubuntu-20.04 if: github.event_name == 'release' && github.event.action == 'published' From 52041c9fd07f8fab8364bea956920afe3d6735b8 Mon Sep 17 00:00:00 2001 From: AJ Friend Date: Fri, 11 Aug 2023 16:10:29 -1000 Subject: [PATCH 2/7] try cibuildwheel@v2.15.0 --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 3181c6d8..2668311d 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -119,7 +119,7 @@ jobs: ## Build - - uses: pypa/cibuildwheel@v2.11.2 + - uses: pypa/cibuildwheel@v2.15.0 env: CIBW_TEST_REQUIRES: pytest numpy CIBW_TEST_COMMAND: pytest {project}/tests From 7e80ba5b484d9c1edc4ed77a2e6acd7b956a73a2 Mon Sep 17 00:00:00 2001 From: AJ Friend Date: Fri, 11 Aug 2023 16:31:32 -1000 Subject: [PATCH 3/7] drop down to cibuildwheel@v2.14.1 --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 2668311d..d6547305 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -119,7 +119,7 @@ jobs: ## Build - - uses: pypa/cibuildwheel@v2.15.0 + - uses: pypa/cibuildwheel@v2.14.1 env: CIBW_TEST_REQUIRES: pytest numpy CIBW_TEST_COMMAND: pytest {project}/tests From f94bea6d8773a49b1c90bb62fa154f070195ae97 Mon Sep 17 00:00:00 2001 From: AJ Friend Date: Fri, 11 Aug 2023 16:49:36 -1000 Subject: [PATCH 4/7] bump ubuntu from 20.04 to 22.04 --- .github/workflows/coverage-lint.yml | 2 +- .github/workflows/deploy_docs.yml | 2 +- .github/workflows/tests.yml | 2 +- .github/workflows/wheels.yml | 20 ++++++++++---------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/coverage-lint.yml b/.github/workflows/coverage-lint.yml index 46626613..9d87b223 100644 --- a/.github/workflows/coverage-lint.yml +++ b/.github/workflows/coverage-lint.yml @@ -9,7 +9,7 @@ on: jobs: tests: name: Coverage and Lint - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml index 7902e5fd..e90d0181 100644 --- a/.github/workflows/deploy_docs.yml +++ b/.github/workflows/deploy_docs.yml @@ -11,7 +11,7 @@ on: jobs: build-docs: name: Build docs - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f694e47b..5137ea9c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: - os: [macos-latest, windows-latest, ubuntu-20.04] + os: [macos-latest, windows-latest, ubuntu-22.04] python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11'] steps: diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index d6547305..c5c00a8f 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -25,7 +25,7 @@ jobs: strategy: matrix: - os: [ubuntu-20.04] + os: [ubuntu-22.04] steps: - uses: actions/checkout@v3 @@ -69,28 +69,28 @@ jobs: - os: windows-latest build: "cp3*-win_amd64" name: Windows 64-bit - - os: ubuntu-20.04 + - os: ubuntu-22.04 build: "cp*-manylinux_x86_64" name: Linux Intel glibc 64-bit - - os: ubuntu-20.04 + - os: ubuntu-22.04 build: "cp*-musllinux_x86_64" name: Linux Intel musl 64-bit - - os: ubuntu-20.04 + - os: ubuntu-22.04 build: "cp36-manylinux_aarch64" name: Linux Aarch64 3.6 - - os: ubuntu-20.04 + - os: ubuntu-22.04 build: "cp37-manylinux_aarch64" name: Linux Aarch64 3.7 - - os: ubuntu-20.04 + - os: ubuntu-22.04 build: "cp38-manylinux_aarch64" name: Linux Aarch64 3.8 - - os: ubuntu-20.04 + - os: ubuntu-22.04 build: "cp39-manylinux_aarch64" name: Linux Aarch64 3.9 - - os: ubuntu-20.04 + - os: ubuntu-22.04 build: "cp310-manylinux_aarch64" name: Linux Aarch64 3.10 - - os: ubuntu-20.04 + - os: ubuntu-22.04 build: "cp311-manylinux_aarch64" name: Linux Aarch64 3.11 @@ -139,7 +139,7 @@ jobs: upload_all: needs: [make_sdist, make_cibw_v2_wheels] - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 if: github.event_name == 'release' && github.event.action == 'published' steps: From 06bf28cddbd73a629566f0f395a3ef2b94cff4c7 Mon Sep 17 00:00:00 2001 From: AJ Friend Date: Fri, 11 Aug 2023 16:54:10 -1000 Subject: [PATCH 5/7] Revert "bump ubuntu from 20.04 to 22.04" This reverts commit f94bea6d8773a49b1c90bb62fa154f070195ae97. --- .github/workflows/coverage-lint.yml | 2 +- .github/workflows/deploy_docs.yml | 2 +- .github/workflows/tests.yml | 2 +- .github/workflows/wheels.yml | 20 ++++++++++---------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/coverage-lint.yml b/.github/workflows/coverage-lint.yml index 9d87b223..46626613 100644 --- a/.github/workflows/coverage-lint.yml +++ b/.github/workflows/coverage-lint.yml @@ -9,7 +9,7 @@ on: jobs: tests: name: Coverage and Lint - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml index e90d0181..7902e5fd 100644 --- a/.github/workflows/deploy_docs.yml +++ b/.github/workflows/deploy_docs.yml @@ -11,7 +11,7 @@ on: jobs: build-docs: name: Build docs - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5137ea9c..f694e47b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: - os: [macos-latest, windows-latest, ubuntu-22.04] + os: [macos-latest, windows-latest, ubuntu-20.04] python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11'] steps: diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index c5c00a8f..d6547305 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -25,7 +25,7 @@ jobs: strategy: matrix: - os: [ubuntu-22.04] + os: [ubuntu-20.04] steps: - uses: actions/checkout@v3 @@ -69,28 +69,28 @@ jobs: - os: windows-latest build: "cp3*-win_amd64" name: Windows 64-bit - - os: ubuntu-22.04 + - os: ubuntu-20.04 build: "cp*-manylinux_x86_64" name: Linux Intel glibc 64-bit - - os: ubuntu-22.04 + - os: ubuntu-20.04 build: "cp*-musllinux_x86_64" name: Linux Intel musl 64-bit - - os: ubuntu-22.04 + - os: ubuntu-20.04 build: "cp36-manylinux_aarch64" name: Linux Aarch64 3.6 - - os: ubuntu-22.04 + - os: ubuntu-20.04 build: "cp37-manylinux_aarch64" name: Linux Aarch64 3.7 - - os: ubuntu-22.04 + - os: ubuntu-20.04 build: "cp38-manylinux_aarch64" name: Linux Aarch64 3.8 - - os: ubuntu-22.04 + - os: ubuntu-20.04 build: "cp39-manylinux_aarch64" name: Linux Aarch64 3.9 - - os: ubuntu-22.04 + - os: ubuntu-20.04 build: "cp310-manylinux_aarch64" name: Linux Aarch64 3.10 - - os: ubuntu-22.04 + - os: ubuntu-20.04 build: "cp311-manylinux_aarch64" name: Linux Aarch64 3.11 @@ -139,7 +139,7 @@ jobs: upload_all: needs: [make_sdist, make_cibw_v2_wheels] - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 if: github.event_name == 'release' && github.event.action == 'published' steps: From b3549383bb9d6479f5923c6bebda8624df50d2ac Mon Sep 17 00:00:00 2001 From: AJ Friend Date: Fri, 11 Aug 2023 16:56:40 -1000 Subject: [PATCH 6/7] bump Python version from 3.8 to 3.11 for coverage/lint and docs --- .github/workflows/coverage-lint.yml | 4 ++-- .github/workflows/deploy_docs.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/coverage-lint.yml b/.github/workflows/coverage-lint.yml index 46626613..0280c0cb 100644 --- a/.github/workflows/coverage-lint.yml +++ b/.github/workflows/coverage-lint.yml @@ -9,7 +9,7 @@ on: jobs: tests: name: Coverage and Lint - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-python@v4.5.0 with: - python-version: 3.8 + python-version: 3.11 - name: Install from source run: | diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml index 7902e5fd..c3a4c3ec 100644 --- a/.github/workflows/deploy_docs.yml +++ b/.github/workflows/deploy_docs.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/setup-python@v4.5.0 with: - python-version: 3.8 + python-version: 3.11 - name: Install dependencies run: | From 5400f4ae3a2e6ea8bc4e6bd98a2e86709dd85995 Mon Sep 17 00:00:00 2001 From: ajfriend Date: Sun, 3 Dec 2023 14:43:06 -0800 Subject: [PATCH 7/7] bump cibuildwheel --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index d6547305..babcea26 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -119,7 +119,7 @@ jobs: ## Build - - uses: pypa/cibuildwheel@v2.14.1 + - uses: pypa/cibuildwheel@v2.16.2 env: CIBW_TEST_REQUIRES: pytest numpy CIBW_TEST_COMMAND: pytest {project}/tests