fix #2021, fix #1954, provide OSX arm64 bins + add pyproject.toml (#2040

)

This commit updates the build workflow to use the latest cibuildwheel as a GitHub Action.
cibuildwheel configuration is now in its own file (as there's no `pyproject.toml` yet)

Signed-off-by: mayeut <mayeut@users.noreply.github.com>

.github/workflows/build.yml

@@ -28,17 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # os: [ubuntu-latest, macos-latest, windows-latest]
         os: [ubuntu-latest, macos-12]
-        include:
-          - {name: Linux, python: '3.9', os: ubuntu-latest}
-    env:
-      CIBW_TEST_COMMAND:
-        PYTHONWARNINGS=always PYTHONUNBUFFERED=1 PSUTIL_DEBUG=1 python {project}/psutil/tests/runner.py &&
-        PYTHONWARNINGS=always PYTHONUNBUFFERED=1 PSUTIL_DEBUG=1 python {project}/psutil/tests/test_memleaks.py
-      CIBW_TEST_EXTRAS: test
-      CIBW_BUILD: 'cp36-* cp37-* cp38-* cp39-* cp310-*'
-      CIBW_SKIP: '*-musllinux_*'
 
     steps:
     - name: Cancel previous runs
@@ -53,16 +43,8 @@ jobs:
         cache: pip
         cache-dependency-path: .github/workflows/build.yml
 
-    - name: Install cibuildwheel
-      run: pip install cibuildwheel
-
-    # - name: (Windows) install Visual C++ for Python 2.7
-    #   if: matrix.os == 'windows-latest'
-    #   run: |
-    #     choco install vcpython27 -f -y
-
     - name: Run tests
-      run: cibuildwheel .
+      uses: pypa/cibuildwheel@v2.11.1
 
     - name: Create wheels
       uses: actions/upload-artifact@v3
@@ -87,16 +69,12 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-12]
-        include:
-          - {name: Linux, python: '3.9', os: ubuntu-latest}
     env:
-      CIBW_ARCHS_LINUX: 'x86_64 i686'
       CIBW_TEST_COMMAND:
         PYTHONWARNINGS=always PYTHONUNBUFFERED=1 PSUTIL_DEBUG=1 python {project}/psutil/tests/runner.py &&
         PYTHONWARNINGS=always PYTHONUNBUFFERED=1 PSUTIL_DEBUG=1 python {project}/psutil/tests/test_memleaks.py
       CIBW_TEST_EXTRAS: test
       CIBW_BUILD: 'cp27-*'
-      CIBW_SKIP: '*-musllinux_*'
 
     steps:
     - name: Cancel previous runs
@@ -111,11 +89,8 @@ jobs:
         cache: pip
         cache-dependency-path: .github/workflows/build.yml
 
-    - name: Install cibuildwheel
-      run: pip install cibuildwheel==1.12.0
-
     - name: Run tests
-      run: cibuildwheel .
+      uses: pypa/cibuildwheel@v1.12.0
 
     - name: Create wheels
       uses: actions/upload-artifact@v3

.gitignore

@@ -17,3 +17,4 @@ syntax: glob
 .tox/
 build/
 dist/
+wheelhouse/

pyproject.toml

@@ -0,0 +1,15 @@
+[build-system]
+requires = ["setuptools>=43"]
+build-backend = "setuptools.build_meta"
+
+[tool.cibuildwheel]
+build = ["cp36-*", "cp37-*", "cp38-*", "cp39-*", "cp310-*"]
+skip = ["*-musllinux*"]
+test-extras = "test"
+test-command = [
+    "PYTHONWARNINGS=always PYTHONUNBUFFERED=1 PSUTIL_DEBUG=1 python {project}/psutil/tests/runner.py",
+    "PYTHONWARNINGS=always PYTHONUNBUFFERED=1 PSUTIL_DEBUG=1 python {project}/psutil/tests/test_memleaks.py"
+]
+
+[tool.cibuildwheel.macos]
+archs = ["x86_64", "arm64"]