From ec89e1b7ee9f2af7e12c9fae181e7918118cb2ed Mon Sep 17 00:00:00 2001 From: mayeut Date: Sat, 25 Dec 2021 19:40:53 +0100 Subject: [PATCH 1/3] chore: update cibuildwheel 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 --- .github/workflows/build.yml | 26 +++----------------------- .gitignore | 1 + cibuildwheel.toml | 11 +++++++++++ 3 files changed, 15 insertions(+), 23 deletions(-) create mode 100644 cibuildwheel.toml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e7d3c4224..870a75fbc 100644 --- a/.github/workflows/build.yml +++ b/.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,10 @@ 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 + with: + config-file: "./cibuildwheel.toml" - name: Create wheels uses: actions/upload-artifact@v3 @@ -87,16 +71,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 diff --git a/.gitignore b/.gitignore index 3d22b0b35..ddafc64c6 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ syntax: glob .tox/ build/ dist/ +wheelhouse/ diff --git a/cibuildwheel.toml b/cibuildwheel.toml new file mode 100644 index 000000000..4f06c5442 --- /dev/null +++ b/cibuildwheel.toml @@ -0,0 +1,11 @@ +[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"] From 9983d96386f1641f5daa348bd48ca09db9cda3f7 Mon Sep 17 00:00:00 2001 From: mayeut Date: Tue, 11 Oct 2022 08:33:21 +0200 Subject: [PATCH 2/3] review: use `pyproject.toml` Signed-off-by: mayeut --- .github/workflows/build.yml | 2 -- cibuildwheel.toml => pyproject.toml | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) rename cibuildwheel.toml => pyproject.toml (82%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 870a75fbc..257b41a2d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,8 +45,6 @@ jobs: - name: Run tests uses: pypa/cibuildwheel@v2.11.1 - with: - config-file: "./cibuildwheel.toml" - name: Create wheels uses: actions/upload-artifact@v3 diff --git a/cibuildwheel.toml b/pyproject.toml similarity index 82% rename from cibuildwheel.toml rename to pyproject.toml index 4f06c5442..47031d268 100644 --- a/cibuildwheel.toml +++ b/pyproject.toml @@ -1,3 +1,7 @@ +[build-system] +requires = ["setuptools>=43"] +build-backend = "setuptools.build_meta" + [tool.cibuildwheel] build = ["cp36-*", "cp37-*", "cp38-*", "cp39-*", "cp310-*"] skip = ["*-musllinux*"] From 93f287a7f9bf4313f389d2f622d28d50c12b28fb Mon Sep 17 00:00:00 2001 From: mayeut Date: Tue, 11 Oct 2022 19:55:37 +0200 Subject: [PATCH 3/3] review: also use cibuildwheel action for cp27 Signed-off-by: mayeut --- .github/workflows/build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 257b41a2d..4c0ef79bd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -89,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