From 8954979b143be8140ed95da2cbe34a744026db35 Mon Sep 17 00:00:00 2001 From: Jason Madden Date: Fri, 8 Dec 2023 13:44:50 -0600 Subject: [PATCH] Use pip to build the wheels. This is slower and involves more moving pieces, but ensures it works as expected. --- .github/workflows/tests.yml | 4 ++-- appveyor.yml | 4 ++-- make-manylinux | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index eba03f57..dfcfcea7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -42,7 +42,7 @@ jobs: - name: Install greenlet (non-Mac) if: ${{ ! startsWith(runner.os, 'Mac') }} run: | - python setup.py bdist_wheel + python -m pip wheel --wheel-dir ./dist . python -m pip install -U -e ".[test,docs]" env: # Ensure we test with assertions enabled. @@ -54,7 +54,7 @@ jobs: - name: Install greenlet (Mac) if: startsWith(runner.os, 'Mac') run: | - python setup.py bdist_wheel + python -m pip wheel --wheel-dir ./dist . python -m pip install -U -e ".[test,docs]" ls -l dist # Something in the build system isn't detecting that we're building for both, diff --git a/appveyor.yml b/appveyor.yml index 9e53eadd..37c3d8fd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,7 +43,7 @@ environment: # Fully supported 64-bit versions, with testing. This should be # all the current (non EOL) versions. - PYTHON: "C:\\Python312-x64" - PYTHON_VERSION: "3.12.0b3" + PYTHON_VERSION: "3.12.0" PYTHON_ARCH: "64" PYTHON_EXE: python APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 @@ -182,7 +182,7 @@ test_script: # - "%CMD_IN_ENV% python -m sphinx -b doctest -d docs/_build/doctrees docs docs/_build/doctest" after_test: - - "%CMD_IN_ENV% python setup.py bdist_wheel" + - "%CMD_IN_ENV% python -mpip wheel --wheel-dir dist ." artifacts: - path: dist\* diff --git a/make-manylinux b/make-manylinux index ded63463..c2ae7dcc 100755 --- a/make-manylinux +++ b/make-manylinux @@ -37,7 +37,8 @@ if [ -d /greenlet -a -d /opt/python ]; then echo "Building $variant $(python --version)" python -mpip install -U pip - python setup.py bdist_wheel + python -mpip install -U setuptools wheel + python -mpip wheel --wheel-dir ./dist . python -mpip install -U .[test] python -m unittest discover -v greenlet.tests PATH="$OPATH" auditwheel repair dist/greenlet*.whl