Merge branch 'main' into fix-ci

Author: graingert

.github/workflows/ci.yml

@@ -5,12 +5,12 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
         with:
           submodules: recursive
-      - uses: actions/setup-python@v1
+      - uses: actions/setup-python@v6
         with:
-          python-version: 3.8
+          python-version: 3.x
       - name: Run lint
         run: |
           python -m pip install tox
@@ -29,10 +29,10 @@ jobs:
         run: |
           git config --global core.autocrlf false
           git config --global core.eol lf
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
         with:
           submodules: recursive
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
@@ -44,16 +44,16 @@ jobs:
   package-sdist:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
         with:
           submodules: recursive
-      - uses: actions/setup-python@v1
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.x
       - name: Build source package
         run: pipx run build --sdist
       - name: Upload source package
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v5
         with:
           name: sdist
           path: dist/
@@ -62,20 +62,15 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        include:
-        - name: manylinux
-          os: ubuntu-latest
-        - name: macos
-          os: macos-latest
-        - name: win
-          os: windows-latest
+        os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
         with:
           submodules: recursive
-      - uses: actions/setup-python@v2
-
+      - uses: actions/setup-python@v6
+        with:
+          python-version: 3.x
       - name: Install cibuildwheel
         run: python -m pip install cibuildwheel
       # - name: Install Visual C++ for Python 2.7
@@ -100,31 +95,31 @@ jobs:
           CIBW_BUILD: cp38-${{ matrix.name }}* pp*-${{ matrix.name }}*
           CIBW_ARCHS_LINUX: auto aarch64
           CIBW_BEFORE_BUILD_LINUX: yum install -y libffi-devel
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
-          name: wheels-${{ matrix.name }}
+          name: wheels-${{ matrix.os }}
           path: ./wheelhouse/*.whl
 
   publish:
     runs-on: ubuntu-latest
     needs: [lint, test, package-sdist, package-wheel]
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/download-artifact@v1
+      - uses: actions/checkout@v5
+      - uses: actions/download-artifact@v6
         with:
           name: sdist
           path: dist/
-      - uses: actions/download-artifact@v1
+      - uses: actions/download-artifact@v6
         with:
-          name: wheels-win
+          name: wheels-windows-latest
           path: dist/
-      - uses: actions/download-artifact@v1
+      - uses: actions/download-artifact@v6
         with:
-          name: wheels-macos
+          name: wheels-macos-latest
           path: dist/
-      - uses: actions/download-artifact@v1
+      - uses: actions/download-artifact@v6
         with:
-          name: wheels-manylinux
+          name: wheels-ubuntu-latest
           path: dist/
       - name: Publish to PyPI
         if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')