Washington-University · Oct 2, 2024 · Oct 2, 2024 · Oct 4, 2024 · Oct 4, 2024 · Oct 4, 2024
Showing with 22 additions and 34 deletions.

+1 −2 .github/workflows/test.yml

+16 −27 .github/workflows/wheels.yml

+2 −2 pyproject.toml

+3 −3 setup.cfg
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,8 +4,7 @@ on:
   push:
     branches:
       - master
-    tags:
-      - "*"
+      - nipy
   pull_request:
     branches:
       - master

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -4,38 +4,18 @@ on:
   push:
     branches:
       - master
-    tags:
-      - "*"
+      - nipy
   pull_request:
     branches:
       - master
+  release:
+    types: [published]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
-  # Extract metadata to allow for conditioning builds on commit messages
-  job_metadata:
-    runs-on: ubuntu-latest
-    outputs:
-      commit_message: ${{ steps.get_commit_message.outputs.commit_message }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 2
-      - name: Print head git commit message
-        id: get_commit_message
-        run: |
-          if [[ -z "$COMMIT_MSG" ]]; then
-            COMMIT_MSG=$(git show -s --format=%s $REF)
-          fi
-          echo commit_message=$COMMIT_MSG | tee -a $GITHUB_OUTPUT
-        env:
-          COMMIT_MSG: ${{ github.event.head_commit.message }}
-          REF: ${{ github.event.pull_request.head.sha }}
-
   build-sdist:
     name: Build sdist
     runs-on: ubuntu-latest
@@ -53,9 +33,8 @@ jobs:
   build-wheel:
     # Runs on tags and commits with "[build wheels]" in the message
     name: Build wheel for ${{ matrix.python }}-${{ matrix.buildplat[1] }}
-    needs: [job_metadata, build-sdist]
+    needs: [build-sdist]
     runs-on: ${{ matrix.buildplat[0] }}
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') || contains(needs.job_metadata.outputs.commit_message, '[build wheels]')
     strategy:
       fail-fast: false
       matrix:
@@ -136,7 +115,11 @@ jobs:
     runs-on: ubuntu-latest
     environment: "Package deployment"
     needs: [pre-publish]
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    if: github.event_name == 'release' && github.event.action == 'published'
+    permissions:
+      id-token: write
+      attestations: write
+
     steps:
       - uses: actions/download-artifact@v3
         with:
@@ -145,6 +128,12 @@ jobs:
         run: |
           mv dist/*/*.{tar.gz,whl} dist
           rmdir dist/*/
+
+      - name: Generate artifact attestations
+        uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
+        with:
+          subject-path: "dist/nipy_gradunwarp-*"
+
       - uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          user: __token__
+          attestations: true
diff --git a/pyproject.toml b/pyproject.toml
@@ -2,7 +2,7 @@
 requires = [
   "setuptools",
   # Numpy 1.25 allows back-compiling and supports 3.9
-  "numpy>=1.25; python_version >= '3.9'",
+  "numpy~=1.25; python_version >= '3.9' and python_version < '3.13'",
   # Last version to support 3.6-3.8
   "numpy==1.19; python_version > '3.0' and python_version < '3.9'",
   # Last version to support 2.7
@@ -35,4 +35,4 @@ push = false
 
 [tool.cibuildwheel]
 # Do not bother building pypy wheels
-skip = "pp*"
+skip = "pp* cp313*"
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [metadata]
-name = gradunwarp
+name = nipy-gradunwarp
 version = file:version.txt
 description = HCP version of Gradient Unwarping Package for Python/Numpy
 author = Human Connectome Project
@@ -25,6 +25,6 @@ packages = find:
 install_requires =
   nibabel >= 3.2.1; python_version >= '3.0'
   nibabel >= 2.0; python_version < '3.0'
-  numpy>=1.26.0b1; python_version > '3.11'
-  numpy; python_version <= '3.11'
+  numpy~=1.26.0; python_version > '3.8'
+  numpy; python_version <= '3.8'
   scipy