From dd02b03ca6512bfcc110fc37a8dce60a195fadc0 Mon Sep 17 00:00:00 2001 From: ajfriend Date: Sat, 9 Mar 2024 17:10:24 -0800 Subject: [PATCH 01/13] update action to actions/setup-python@v5.0.0 --- .github/workflows/coverage-lint.yml | 2 +- .github/workflows/deploy_docs.yml | 2 +- .github/workflows/tests.yml | 2 +- .github/workflows/wheels.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/coverage-lint.yml b/.github/workflows/coverage-lint.yml index 878239a5..6ed100c0 100644 --- a/.github/workflows/coverage-lint.yml +++ b/.github/workflows/coverage-lint.yml @@ -16,7 +16,7 @@ jobs: with: submodules: recursive - - uses: actions/setup-python@v4.5.0 + - uses: actions/setup-python@v5.0.0 with: python-version: 3.11 diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml index c3a4c3ec..811f8117 100644 --- a/.github/workflows/deploy_docs.yml +++ b/.github/workflows/deploy_docs.yml @@ -18,7 +18,7 @@ jobs: with: submodules: recursive - - uses: actions/setup-python@v4.5.0 + - uses: actions/setup-python@v5.0.0 with: python-version: 3.11 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9e68286a..bcdec57a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,7 +21,7 @@ jobs: with: submodules: recursive - - uses: actions/setup-python@v4.5.0 + - uses: actions/setup-python@v5.0.0 with: python-version: '${{ matrix.python-version }}' diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 2b4fa4ff..a747304d 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -33,7 +33,7 @@ jobs: submodules: recursive - name: Setup Python - uses: actions/setup-python@v4.5.0 + uses: actions/setup-python@v5.0.0 - name: Make sdist run: | From b6c6a00586a1df5d9b3cb233d2f705abbe95d920 Mon Sep 17 00:00:00 2001 From: ajfriend Date: Sat, 9 Mar 2024 17:12:38 -0800 Subject: [PATCH 02/13] to actions/upload-artifact@v4.3.1 --- .github/workflows/coverage-lint.yml | 2 +- .github/workflows/wheels.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/coverage-lint.yml b/.github/workflows/coverage-lint.yml index 6ed100c0..06d1c258 100644 --- a/.github/workflows/coverage-lint.yml +++ b/.github/workflows/coverage-lint.yml @@ -51,6 +51,6 @@ jobs: cp _skbuild/*/cmake-build/src/h3/_cy/*.html ./annotations - name: Upload artifacts to GitHub - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4.3.1 with: path: ./annotations diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index a747304d..714dd3bc 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -52,7 +52,7 @@ jobs: run: pytest --cov=h3 --full-trace - name: Upload artifacts to GitHub - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4.3.1 with: path: ./dist @@ -136,7 +136,7 @@ jobs: pipx run twine check wheelhouse/* - name: Upload artifacts to GitHub - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4.3.1 with: path: wheelhouse/*.whl From 353f48f1b62bf4a4a9c688d26a80e2dbf8d2ddf7 Mon Sep 17 00:00:00 2001 From: ajfriend Date: Sat, 9 Mar 2024 17:13:35 -0800 Subject: [PATCH 03/13] to codecov/codecov-action@v4.1.0 --- .github/workflows/coverage-lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage-lint.yml b/.github/workflows/coverage-lint.yml index 06d1c258..a5a4bb55 100644 --- a/.github/workflows/coverage-lint.yml +++ b/.github/workflows/coverage-lint.yml @@ -40,7 +40,7 @@ jobs: pytest --cov=h3 --full-trace --cov-report=xml - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3.0.0 + uses: codecov/codecov-action@v4.1.0 with: file: ./coverage.xml fail_ci_if_error: true From 14929361dcb7e3158ec61ff68f2feedc3f771fc5 Mon Sep 17 00:00:00 2001 From: ajfriend Date: Sat, 9 Mar 2024 17:15:50 -0800 Subject: [PATCH 04/13] to actions/checkout@v4.1.1 --- .github/workflows/coverage-lint.yml | 2 +- .github/workflows/deploy_docs.yml | 2 +- .github/workflows/tests.yml | 2 +- .github/workflows/wheels.yml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/coverage-lint.yml b/.github/workflows/coverage-lint.yml index a5a4bb55..806183de 100644 --- a/.github/workflows/coverage-lint.yml +++ b/.github/workflows/coverage-lint.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4.1.1 with: submodules: recursive diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml index 811f8117..5d02d5b9 100644 --- a/.github/workflows/deploy_docs.yml +++ b/.github/workflows/deploy_docs.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4.1.1 with: submodules: recursive diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index bcdec57a..f5253a5b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,7 +17,7 @@ jobs: python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4.1.1 with: submodules: recursive diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 714dd3bc..6c611322 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -28,7 +28,7 @@ jobs: os: [ubuntu-20.04] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4.1.1 with: submodules: recursive @@ -98,7 +98,7 @@ jobs: name: Linux Aarch64 3.12 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4.1.1 with: submodules: recursive From 63d8eb22d3e6d26c18b4e43699b744e6d1144f12 Mon Sep 17 00:00:00 2001 From: ajfriend Date: Sat, 9 Mar 2024 17:29:54 -0800 Subject: [PATCH 05/13] Revert "to codecov/codecov-action@v4.1.0" This reverts commit 353f48f1b62bf4a4a9c688d26a80e2dbf8d2ddf7. --- .github/workflows/coverage-lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage-lint.yml b/.github/workflows/coverage-lint.yml index 806183de..5706965f 100644 --- a/.github/workflows/coverage-lint.yml +++ b/.github/workflows/coverage-lint.yml @@ -40,7 +40,7 @@ jobs: pytest --cov=h3 --full-trace --cov-report=xml - name: Upload coverage to Codecov - uses: codecov/codecov-action@v4.1.0 + uses: codecov/codecov-action@v3.0.0 with: file: ./coverage.xml fail_ci_if_error: true From 67eb61b69aad5b31552816c31f67490f68469b97 Mon Sep 17 00:00:00 2001 From: ajfriend Date: Sat, 9 Mar 2024 18:04:36 -0800 Subject: [PATCH 06/13] Revert "to actions/upload-artifact@v4.3.1" This reverts commit b6c6a00586a1df5d9b3cb233d2f705abbe95d920. --- .github/workflows/coverage-lint.yml | 2 +- .github/workflows/wheels.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/coverage-lint.yml b/.github/workflows/coverage-lint.yml index 5706965f..a4232771 100644 --- a/.github/workflows/coverage-lint.yml +++ b/.github/workflows/coverage-lint.yml @@ -51,6 +51,6 @@ jobs: cp _skbuild/*/cmake-build/src/h3/_cy/*.html ./annotations - name: Upload artifacts to GitHub - uses: actions/upload-artifact@v4.3.1 + uses: actions/upload-artifact@v3 with: path: ./annotations diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 6c611322..f3ad3ba8 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -52,7 +52,7 @@ jobs: run: pytest --cov=h3 --full-trace - name: Upload artifacts to GitHub - uses: actions/upload-artifact@v4.3.1 + uses: actions/upload-artifact@v3 with: path: ./dist @@ -136,7 +136,7 @@ jobs: pipx run twine check wheelhouse/* - name: Upload artifacts to GitHub - uses: actions/upload-artifact@v4.3.1 + uses: actions/upload-artifact@v3 with: path: wheelhouse/*.whl From e512f0e0db08788259d6524197567ce6de8be502 Mon Sep 17 00:00:00 2001 From: ajfriend Date: Sun, 10 Mar 2024 11:53:34 -0700 Subject: [PATCH 07/13] ilammy/msvc-dev-cmd@v1.13.0 --- .github/workflows/tests.yml | 2 +- .github/workflows/wheels.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f5253a5b..793ba683 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,7 +26,7 @@ jobs: python-version: '${{ matrix.python-version }}' ## Start Windows stuff - - uses: ilammy/msvc-dev-cmd@v1.12.0 + - uses: ilammy/msvc-dev-cmd@v1.13.0 if: startsWith(matrix.os, 'windows') - name: Set Windows Compiler diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index f3ad3ba8..c0d9a822 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -104,7 +104,7 @@ jobs: ## Setup Env - - uses: ilammy/msvc-dev-cmd@v1.12.0 + - uses: ilammy/msvc-dev-cmd@v1.13.0 if: runner.os == 'Windows' - name: Set Windows variables From 92211626004cd027d4061753eb6fc48af89bb48a Mon Sep 17 00:00:00 2001 From: ajfriend Date: Sun, 10 Mar 2024 15:24:06 -0700 Subject: [PATCH 08/13] docker/setup-qemu-action@v3.0.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 c0d9a822..b64bde06 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -116,7 +116,7 @@ jobs: - name: Set up QEMU if: runner.os == 'Linux' - uses: docker/setup-qemu-action@v2.1.0 + uses: docker/setup-qemu-action@v3.0.0 with: platforms: aarch64 From ce88de5ab843d3bd3c751239c85d85d1e6ed1890 Mon Sep 17 00:00:00 2001 From: ajfriend Date: Sun, 10 Mar 2024 15:34:32 -0700 Subject: [PATCH 09/13] ubuntu-22.04 --- .github/workflows/deploy_docs.yml | 2 +- .github/workflows/tests.yml | 2 +- .github/workflows/wheels.yml | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml index 5d02d5b9..7d276f8e 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@v4.1.1 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 793ba683..dbed24a9 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', '3.12'] steps: diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index b64bde06..dc063791 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@v4.1.1 @@ -69,31 +69,31 @@ 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 - - os: ubuntu-20.04 + - os: ubuntu-22.04 build: 'cp312-manylinux_aarch64' name: Linux Aarch64 3.12 @@ -142,7 +142,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 51ca6a97a6814fd2557983d401d6b4a4f45801cf Mon Sep 17 00:00:00 2001 From: ajfriend Date: Sun, 10 Mar 2024 15:46:52 -0700 Subject: [PATCH 10/13] drop 3.6 --- .github/workflows/tests.yml | 2 +- .github/workflows/wheels.yml | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index dbed24a9..0d4b58fc 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: os: [macos-latest, windows-latest, ubuntu-22.04] - python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] + python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v4.1.1 diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index dc063791..393d3572 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -75,9 +75,6 @@ jobs: - os: ubuntu-22.04 build: 'cp*-musllinux_x86_64' name: Linux Intel musl 64-bit - - os: ubuntu-22.04 - build: 'cp36-manylinux_aarch64' - name: Linux Aarch64 3.6 - os: ubuntu-22.04 build: 'cp37-manylinux_aarch64' name: Linux Aarch64 3.7 From 21e42cb2762d266cef27ffc3e15a157581581618 Mon Sep 17 00:00:00 2001 From: ajfriend Date: Sun, 10 Mar 2024 16:12:07 -0700 Subject: [PATCH 11/13] peaceiris/actions-gh-pages@v3.9.3 --- .github/workflows/deploy_docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml index 7d276f8e..ceec196a 100644 --- a/.github/workflows/deploy_docs.yml +++ b/.github/workflows/deploy_docs.yml @@ -42,7 +42,7 @@ jobs: # Deploy the book's HTML to gh-pages branch - name: GitHub Pages action - uses: peaceiris/actions-gh-pages@v3.7.3 + uses: peaceiris/actions-gh-pages@v3.9.3 with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: docs/_build/html From a55a14883b1890135e25aa9001ee9239930b1f2e Mon Sep 17 00:00:00 2001 From: ajfriend Date: Sun, 10 Mar 2024 16:17:02 -0700 Subject: [PATCH 12/13] Revert "Revert "to codecov/codecov-action@v4.1.0"" This reverts commit 63d8eb22d3e6d26c18b4e43699b744e6d1144f12. --- .github/workflows/coverage-lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage-lint.yml b/.github/workflows/coverage-lint.yml index a4232771..95ff8f03 100644 --- a/.github/workflows/coverage-lint.yml +++ b/.github/workflows/coverage-lint.yml @@ -40,7 +40,7 @@ jobs: pytest --cov=h3 --full-trace --cov-report=xml - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3.0.0 + uses: codecov/codecov-action@v4.1.0 with: file: ./coverage.xml fail_ci_if_error: true From e2b5f94cb7e5275c7592e8c0af26a6abe23e5ee8 Mon Sep 17 00:00:00 2001 From: ajfriend Date: Sun, 10 Mar 2024 16:29:28 -0700 Subject: [PATCH 13/13] Revert "Revert "Revert "to codecov/codecov-action@v4.1.0""" This reverts commit a55a14883b1890135e25aa9001ee9239930b1f2e. --- .github/workflows/coverage-lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage-lint.yml b/.github/workflows/coverage-lint.yml index 95ff8f03..a4232771 100644 --- a/.github/workflows/coverage-lint.yml +++ b/.github/workflows/coverage-lint.yml @@ -40,7 +40,7 @@ jobs: pytest --cov=h3 --full-trace --cov-report=xml - name: Upload coverage to Codecov - uses: codecov/codecov-action@v4.1.0 + uses: codecov/codecov-action@v3.0.0 with: file: ./coverage.xml fail_ci_if_error: true