From 4561cd213c6bebe5d45f8f9f43dcb1140a82f78c Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Wed, 6 Nov 2024 11:07:06 -0500 Subject: [PATCH 1/8] MAINT: Add dependabot and fix outdated action --- .github/dependabot.yml | 10 ++++++++++ .github/workflows/wheels.yml | 16 ++++++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..d57929b9 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,10 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "monthly" + groups: + actions: + patterns: + - "*" diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 7e1ce3bb..34a29297 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -44,7 +44,7 @@ jobs: fetch-depth: 0 - name: Build sdist run: pipx run build -s - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: sdist path: ./dist/*.tar.gz @@ -96,7 +96,7 @@ jobs: env: CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: ${{ matrix.python == '*' && 'all' || matrix.python }}-${{ startsWith(matrix.buildplat[1], 'macosx') && 'macosx' || matrix.buildplat[1] }} path: ./wheelhouse/*.whl @@ -106,7 +106,7 @@ jobs: needs: [build-sdist] runs-on: ubuntu-latest steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: sdist path: ./dist @@ -127,7 +127,7 @@ jobs: runs-on: ubuntu-latest needs: [test-sdist, build-wheel] steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: path: dist/ - name: Check artifacts @@ -143,16 +143,20 @@ jobs: runs-on: ubuntu-latest environment: "Package deployment" needs: [pre-publish] - if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: path: dist/ + pattern: '*' + merge-multiple: true - name: Consolidate artifacts run: | + set -eo pipefail mv dist/*/*.{tar.gz,whl} dist rmdir dist/*/ + ls -lR dist/ - uses: pypa/gh-action-pypi-publish@release/v1 with: user: __token__ password: ${{ secrets.PYPI_API_TOKEN }} + if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') From c1e0fbb67fa0090f7666fe37b3eaef866cd097bd Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Wed, 6 Nov 2024 11:19:54 -0500 Subject: [PATCH 2/8] TST: More [build wheels] From afcc99e4068c0219dc1d2d6c7187453ddf0fdf29 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Wed, 6 Nov 2024 11:25:33 -0500 Subject: [PATCH 3/8] TST: More [build wheels] --- .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 34a29297..92642510 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -82,7 +82,7 @@ jobs: - uses: actions/setup-python@v3 - name: Update pip/pipx - run: pip install --upgrade pip pipx + run: python -m pip install --upgrade pip pipx # For aarch64 support # https://cibuildwheel.pypa.io/en/stable/faq/#emulation From e36e4dc8d8324c48a1958965e65c53d61734463b Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Wed, 6 Nov 2024 11:39:37 -0500 Subject: [PATCH 4/8] TST: More [build wheels] --- .github/workflows/wheels.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 92642510..50fac7fd 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -130,19 +130,23 @@ jobs: - uses: actions/download-artifact@v4 with: path: dist/ + pattern: '*' + merge-multiple: true - name: Check artifacts run: ls -lR - name: Consolidate and re-check run: | + set -eo pipefail mv dist/*/*.{tar.gz,whl} dist rmdir dist/*/ - ls -lR + ls -lR dist/ - run: pipx run twine check dist/* publish: runs-on: ubuntu-latest environment: "Package deployment" needs: [pre-publish] + if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') steps: - uses: actions/download-artifact@v4 with: @@ -159,4 +163,3 @@ jobs: with: user: __token__ password: ${{ secrets.PYPI_API_TOKEN }} - if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') From bbebd8918e1a5c5cc715d79bd79ee6afc2330b60 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Wed, 6 Nov 2024 11:50:06 -0500 Subject: [PATCH 5/8] TST: More [build wheels] --- .github/workflows/wheels.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 50fac7fd..89762e3f 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -137,6 +137,7 @@ jobs: - name: Consolidate and re-check run: | set -eo pipefail + ls -lR dist/ mv dist/*/*.{tar.gz,whl} dist rmdir dist/*/ ls -lR dist/ @@ -156,6 +157,7 @@ jobs: - name: Consolidate artifacts run: | set -eo pipefail + ls -lR dist/ mv dist/*/*.{tar.gz,whl} dist rmdir dist/*/ ls -lR dist/ From f9c0f3381e8faf566ae06b7b7610b361903ec0b9 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Wed, 6 Nov 2024 11:59:47 -0500 Subject: [PATCH 6/8] TST: More [build wheels] --- .github/workflows/wheels.yml | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 89762e3f..c7d34307 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -46,7 +46,7 @@ jobs: run: pipx run build -s - uses: actions/upload-artifact@v4 with: - name: sdist + name: source-dist path: ./dist/*.tar.gz build-wheel: @@ -98,7 +98,7 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: ${{ matrix.python == '*' && 'all' || matrix.python }}-${{ startsWith(matrix.buildplat[1], 'macosx') && 'macosx' || matrix.buildplat[1] }} + name: ${{ matrix.python == '*' && 'all' || matrix.python }}-${{ startsWith(matrix.buildplat[1], 'macosx') && 'macosx' || matrix.buildplat[1] }}-dist path: ./wheelhouse/*.whl test-sdist: @@ -108,7 +108,7 @@ jobs: steps: - uses: actions/download-artifact@v4 with: - name: sdist + name: source-dist path: ./dist - uses: actions/setup-python@v4 with: @@ -130,17 +130,10 @@ jobs: - uses: actions/download-artifact@v4 with: path: dist/ - pattern: '*' + pattern: '*-dist' merge-multiple: true - name: Check artifacts - run: ls -lR - - name: Consolidate and re-check - run: | - set -eo pipefail - ls -lR dist/ - mv dist/*/*.{tar.gz,whl} dist - rmdir dist/*/ - ls -lR dist/ + run: ls -lR dist/ - run: pipx run twine check dist/* publish: @@ -154,13 +147,7 @@ jobs: path: dist/ pattern: '*' merge-multiple: true - - name: Consolidate artifacts - run: | - set -eo pipefail - ls -lR dist/ - mv dist/*/*.{tar.gz,whl} dist - rmdir dist/*/ - ls -lR dist/ + - run: ls -lR dist/ - uses: pypa/gh-action-pypi-publish@release/v1 with: user: __token__ From c059a21f9544afc492cd61d3cce97f7ef3e681bd Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Wed, 6 Nov 2024 12:09:22 -0500 Subject: [PATCH 7/8] Update .github/workflows/wheels.yml [build wheels] Co-authored-by: Chris Markiewicz --- .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 c7d34307..1e309ac6 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -145,7 +145,7 @@ jobs: - uses: actions/download-artifact@v4 with: path: dist/ - pattern: '*' + pattern: '*-dist' merge-multiple: true - run: ls -lR dist/ - uses: pypa/gh-action-pypi-publish@release/v1 From 40f319673f1e59f6536aa7a440a79cc04d1edda5 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Wed, 6 Nov 2024 12:10:14 -0500 Subject: [PATCH 8/8] TST: More [build wheels] --- .github/workflows/wheels.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 1e309ac6..8073b367 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -132,8 +132,7 @@ jobs: path: dist/ pattern: '*-dist' merge-multiple: true - - name: Check artifacts - run: ls -lR dist/ + - run: ls -lR dist/ - run: pipx run twine check dist/* publish: