Merge branch 'master' into usecounter

.github/workflows/wheels.yml

@@ -23,8 +23,9 @@ jobs:
     - name: Build SDist
       run: pipx run build --sdist
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       with:
+        name: artifact-sdist
         path: dist/*.tar.gz
 
   build_wheels:
@@ -47,22 +48,24 @@ jobs:
         MACOSX_DEPLOYMENT_TARGET: 10.14
 
     - name: Upload wheels
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
+        name: artifact-wheel-${{ matrix.os }}
         path: wheelhouse/*.whl
 
-  upload_all:
+  pypi-publish:
     needs: [build_wheels, make_sdist]
+    name: Upload release to PyPI
     runs-on: ubuntu-latest
     if: github.event_name == 'release' && github.event.action == 'published'
-
+    permissions:
+      id-token: write
     steps:
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v4
       with:
-        name: artifact
         path: dist
+        pattern: artifact-*
+        merge-multiple: true
 
-    - uses: pypa/gh-action-pypi-publish@v1.9.0
-      with:
-        user: __token__
-        password: ${{ secrets.pypi_token }}
+    - name: Publish package distributions to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1