Commit 4f523551 authored by Jason Madden's avatar Jason Madden

Minimum changes to try to build with 3.12

parent bee9fafd
...@@ -83,13 +83,17 @@ jobs: ...@@ -83,13 +83,17 @@ jobs:
# 3.10+ needs more work: dnspython for example doesn't work # 3.10+ needs more work: dnspython for example doesn't work
# with it. That means for the bulk of our testing we need to # with it. That means for the bulk of our testing we need to
# stick to 3.9. # stick to 3.9.
python-version: [3.8, 3.9, '3.10', '3.11'] # XXX: PyPy came out of the matrix!
python-version: ["3.12-dev", 3.8, 3.9, '3.10', '3.11']
os: [macos-latest, ubuntu-latest] os: [macos-latest, ubuntu-latest]
exclude: exclude:
- os: macos-latest - os: macos-latest
python-version: 3.8 python-version: 3.8
- os: macos-latest - os: macos-latest
python-version: 3.9 python-version: 3.9
- os: macos-latest
python-version: 3.10
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
...@@ -162,7 +166,7 @@ jobs: ...@@ -162,7 +166,7 @@ jobs:
pip install -U -q setuptools wheel twine pip install -U -q setuptools wheel twine
pip install -q -U 'cffi;platform_python_implementation=="CPython"' pip install -q -U 'cffi;platform_python_implementation=="CPython"'
pip install -q -U 'cython>=3.0b3; python_version < "3.12"' "Cython @ https://github.com/cython/cython/archive/37f4dcdc04547875e2836fda076f5707ec50e579.zip; python_version >= '3.12'" pip install -q -U 'cython>=3.0b3; python_version < "3.12"' "Cython @ https://github.com/cython/cython/archive/37f4dcdc04547875e2836fda076f5707ec50e579.zip; python_version >= '3.12'"
pip install 'greenlet>=2.0.0 ;platform_python_implementation=="CPython"' pip install 'greenlet>=2.0.0 ;platform_python_implementation=="CPython"' 'greenlet >= 3.0a1; python_version >="3.12"'
- name: Build gevent (non-Mac) - name: Build gevent (non-Mac)
if: ${{ ! startsWith(runner.os, 'Mac') }} if: ${{ ! startsWith(runner.os, 'Mac') }}
......
...@@ -44,6 +44,12 @@ environment: ...@@ -44,6 +44,12 @@ environment:
# Pre-installed Python versions, which Appveyor may upgrade to # Pre-installed Python versions, which Appveyor may upgrade to
# a later point release. # a later point release.
# XXX: Cython 3.0b3 won't build us on 3.12 yet.
# - PYTHON: "C:\\Python312-x64"
# PYTHON_VERSION: "3.12.0b3"
# PYTHON_ARCH: "64"
# PYTHON_EXE: python
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
# 64-bit # 64-bit
- PYTHON: "C:\\Python311-x64" - PYTHON: "C:\\Python311-x64"
......
...@@ -116,7 +116,7 @@ if [ -d /gevent -a -d /opt/python ]; then ...@@ -116,7 +116,7 @@ if [ -d /gevent -a -d /opt/python ]; then
mkdir /gevent/wheelhouse mkdir /gevent/wheelhouse
OPATH="$PATH" OPATH="$PATH"
which auditwheel which auditwheel
for variant in `ls -d /opt/python/cp{310,38,39,311}*`; do for variant in `ls -d /opt/python/cp{310,38,39,311,312}*`; do
export PATH="$variant/bin:$OPATH" export PATH="$variant/bin:$OPATH"
echo "Building $variant $(python --version)" echo "Building $variant $(python --version)"
...@@ -125,7 +125,8 @@ if [ -d /gevent -a -d /opt/python ]; then ...@@ -125,7 +125,8 @@ if [ -d /gevent -a -d /opt/python ]; then
# The downside is that we must install dependencies manually. # The downside is that we must install dependencies manually.
# NOTE: We can't upgrade ``wheel`` because ``auditwheel`` depends on # NOTE: We can't upgrade ``wheel`` because ``auditwheel`` depends on
# it, and auditwheel is installed in one of these environments. # it, and auditwheel is installed in one of these environments.
python -mpip install -U "cython >= 3.0a6" cffi 'greenlet >= 2.0.0' setuptools python -m pip install -U 'cython>=3.0b3; python_version < "3.12"' "Cython @ https://github.com/cython/cython/archive/37f4dcdc04547875e2836fda076f5707ec50e579.zip; python_version >= '3.12'"
python -mpip install -U cffi 'greenlet >= 2.0.0; python_version < "3.12"' 'greenlet >= 3.0a1; python_version >= "3.12"' setuptools
time (python setup.py bdist_wheel) time (python setup.py bdist_wheel)
PATH="$OPATH" auditwheel repair dist/gevent*.whl PATH="$OPATH" auditwheel repair dist/gevent*.whl
cp wheelhouse/gevent*.whl /gevent/wheelhouse cp wheelhouse/gevent*.whl /gevent/wheelhouse
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment