Merge branch 'main' into setup

Author: ndevenish

.github/workflows/build_wheels.yml

@@ -23,7 +23,7 @@ jobs:
             - name: Build sdist
               run: pipx run poetry build -f sdist
 
-            - uses: actions/upload-artifact@v2
+            - uses: actions/upload-artifact@v4
               with:
                   path: dist/*.tar.gz
                   name: sdist
@@ -37,7 +37,7 @@ jobs:
                 os: [ubuntu-20.04, macos-10.15, windows-2019]
 
         steps:
-            - uses: actions/download-artifact@v2
+            - uses: actions/download-artifact@v4
               with:
                   name: sdist
                   path: dist
@@ -55,7 +55,7 @@ jobs:
                   CIBW_TEST_COMMAND: pytest --regression {package}/tests
                   CIBW_BEFORE_TEST: pip install pytest dials-data
 
-            - uses: actions/upload-artifact@v2
+            - uses: actions/upload-artifact@v4
               with:
                   path: ./wheelhouse/*.whl
 
@@ -67,12 +67,12 @@ jobs:
         # alternatively, to publish when a GitHub Release is created, use the following rule:
         # if: github.event_name == 'release' && github.event.action == 'published'
         steps:
-            - uses: actions/download-artifact@v2
+            - uses: actions/download-artifact@v4
               with:
                   name: sdist
                   path: dist
 
-            - uses: actions/download-artifact@v2
+            - uses: actions/download-artifact@v4
               with:
                   name: artifact
                   path: dist