Skip to content

Commit

Permalink
Adjusting Cython versions.
Browse files Browse the repository at this point in the history
  • Loading branch information
jamadden committed Jun 29, 2023
1 parent f57ae5a commit 36ae143
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
run: |
pip install -U pip
pip install -U -q setuptools wheel twine
pip install -q -U 'cython>=3.0b3'
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 -U coverage
pip install -U cffi
- name: Build mysqlclient
Expand Down
5 changes: 4 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,11 @@ requires = [
# 3.0 in general has improved language support.
# Python 3.12 requires a snapshot at this writing (2023-06-29). This is just before
# 3.0rc1
"Cython >= 3.0b3; python_version < '3.12'",
# Unfortunately, markers like python_version do not work for remote installs,
# so we may always get that one?
# Remember to change this in tests.yml as well
"Cython @ https://github.com/cython/cython/archive/37f4dcdc04547875e2836fda076f5707ec50e579.zip",
"Cython >= 3.0b3; python_version < '3.12'",
# cffi on py3.12 macOS at least fails to install from its wheel if we let it get installed
# as part of persistent:
# OSError: [Errno 66] Directory not empty: '///persistent.../.eggs/cffi-1.15.1-py3.12-macosx-10.9-universal2.egg/cffi-1.15.1.dist-info' -> '//persistent_/.eggs/cffi-1.15.1-py3.12-macosx-10.9-universal2.egg/EGG-INFO'
Expand Down
3 changes: 2 additions & 1 deletion scripts/releases/make-manylinux
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ if [ -d /RelStorage -a -d /opt/python ]; then
git clone /RelStorage RelStorage
cd RelStorage
$variant/bin/pip install -U pip
#$variant/bin/pip install -U 'cython>=3.0b3' setuptools
$variant/bin/pip install -U setuptools
$variant/bin/pip install -U 'cython>=3.0b3; python_version < "3.12"' "Cython @ https://github.com/cython/cython/archive/37f4dcdc04547875e2836fda076f5707ec50e579.zip; python_version >= '3.12'"
PATH=$variant/bin:$PATH $variant/bin/python setup.py bdist_wheel
auditwheel show dist/RelStorage*.whl
auditwheel repair dist/RelStorage*.whl
Expand Down

0 comments on commit 36ae143

Please sign in to comment.