Merge branch 'main' into mmg/pytorch-wrapper

Author: matt-graham

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/build.yml

@@ -50,11 +50,14 @@ jobs:
         os: [ubuntu-latest, macos-latest]
 
     steps:
-      - uses: actions/checkout@v4
-
+      - uses: actions/[email protected]
+        with:
+          fetch-depth: 0
+          fetch-tags: true
       - name: Build wheels
-        uses: pypa/[email protected]
-
+        uses: pypa/[email protected]
+        env:
+          CIBW_SKIP: pp*-macosx_arm64
       - uses: actions/upload-artifact@v4
         with:
           name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
@@ -64,23 +67,26 @@ jobs:
     name: Build source distribution
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-
+      - uses: actions/[email protected]
+        with:
+          fetch-depth: 0
+          fetch-tags: true
       - name: Build sdist
         run: pipx run build --sdist
-
       - uses: actions/upload-artifact@v4
         with:
           name: cibw-sdist
           path: dist/*.tar.gz
 
-  upload_pypi:
+  upload_test_pypi:
     needs: [build_wheels, build_sdist]
     runs-on: ubuntu-latest
-    environment: pypi
+    environment: test-pypi
     permissions:
       id-token: write
-    if: github.event_name == 'release' && github.event.action == 'published'
+    if: |
+      (github.event_name == 'release' && github.event.action == 'published') || 
+      (github.event_name == 'push' && github.ref == 'refs/heads/main')
     steps:
       - uses: actions/download-artifact@v4
         with:
@@ -95,6 +101,19 @@ jobs:
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           repository-url: https://test.pypi.org/legacy/
+
+  upload_pypi:
+    needs: [build_wheels, build_sdist, upload_test_pypi]
+    runs-on: ubuntu-latest
+    environment: pypi
+    permissions:
+      id-token: write
+    if: github.event_name == 'release' && github.event.action == 'published'
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          pattern: cibw-*
+          path: dist
+          merge-multiple: true
       - name: Publish package distribution to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
-          

.github/workflows/docs.yml

@@ -15,10 +15,10 @@ jobs:
 
     steps:
     - name: Checkout Source
-      uses: actions/checkout@v2.3.1
+      uses: actions/checkout@v4.2.2
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -34,7 +34,7 @@ jobs:
 
     - name: Deploy
       if: github.ref == 'refs/heads/main'
-      uses: JamesIves/github-pages-deploy-action@4.1.5
+      uses: JamesIves/github-pages-deploy-action@v4.7.3
       with:
         branch: gh-pages # The branch the action should deploy to.
         folder: docs/_build/html # The folder the action should deploy.

.github/workflows/linting.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.2.2
 
       - name: Cache pre-commit
         uses: actions/cache@v4

.github/workflows/tests.yml

@@ -33,10 +33,15 @@ jobs:
           - os: macos-latest
             python-version: "3.8"
       fail-fast: false
+    env:
+      CMAKE_POLICY_VERSION_MINIMUM: 3.5
 
     steps:
     - name: Checkout Source
-      uses: actions/checkout@v4
+      uses: actions/[email protected]
+      with:
+        fetch-depth: 0
+        fetch-tags: true
 
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v5
@@ -54,6 +59,6 @@ jobs:
         pytest -v --cov-report=xml --cov=s2fft --cov-config=.coveragerc
 
     - name: Upload coverage reports to Codecov
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v5
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.gitmodules

@@ -2,11 +2,8 @@ graft s2fft
 graft tests
 graft docs
 
-include .pip_readme.rst
-include README.rst
-include pytest.ini
+include README.md
 include LICENCE.txt
-include s2fft/default-logging-config.yaml
 
 exclude .coveragerc
 exclude *.log