Skip to content

Commit

Permalink
Use pip to build the wheels.
Browse files Browse the repository at this point in the history
This is slower and involves more moving pieces, but ensures it works as expected.
  • Loading branch information
jamadden committed Dec 8, 2023
1 parent 1dc71e3 commit 8954979
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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\*
Expand Down
3 changes: 2 additions & 1 deletion make-manylinux
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8954979

Please # to comment.