Skip to content

Commit 7a9373b

Browse files
gnossengnossen
authored
[Backport] [dependency] Restrict cython to less than 3.X (#33770)
*Beep boop. This is an automatically generated backport of #33738.* This should resolve breakage on master caused by the jump to Cython 3.0.0 this morning.
1 parent fdb64a6 commit 7a9373b

File tree

17 files changed

+45
-44
lines changed

17 files changed

+45
-44
lines changed

‎requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# GRPC Python setup requirements
22
coverage>=4.0
3-
cython>=0.29.8
3+
cython>=0.29.8,<3.0.0rc1
44
protobuf>=4.21.3,<5.0dev
55
wheel>=0.29

‎setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,8 +500,8 @@ def cython_extensions_and_necessity():
500500
"other commands, but the extension files will fail to build.\n")
501501
elif need_cython:
502502
sys.stderr.write(
503-
'We could not find Cython. Setup may take 10-20 minutes.\n')
504-
SETUP_REQUIRES += ('cython>=0.23',)
503+
"We could not find Cython. Setup may take 10-20 minutes.\n")
504+
SETUP_REQUIRES += ("cython>=0.23,<3.0.0rc1",)
505505

506506
COMMAND_CLASS = {
507507
'doc': commands.SphinxDocumentation,

‎tools/dockerfile/grpc_artifact_python_linux_armv7/install_python_for_wheel_crosscompilation.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ popd
4444
rm -rf "Python-${PYTHON_VERSION}"
4545

4646
# install cython and wheel
47-
"${PYTHON_PREFIX}/bin/python3" -m pip install --upgrade cython wheel
47+
"${PYTHON_PREFIX}/bin/python3" -m pip install --upgrade 'cython<3.0.0rc1' wheel

‎tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64.current_version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_aarch64:8f31a9a0d9098577fa01bacbfc2940e7894fa0bd@sha256:9ea49947ec64337cdd40086912b59ace394179f87cf42531a077c5e5b86c1fe0
1+
us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_aarch64:6e2cf9602baccda05d82402885660e028cc3ebc6@sha256:d56ea4394ea5ea9d09f940d1dba31e6196a8e919f60c6a4966a9192faa997f11

‎tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ ENV AUDITWHEEL_PLAT manylinux_2_17_$AUDITWHEEL_ARCH
1919

2020
###################################
2121
# Install Python build requirements
22-
RUN /opt/python/cp36-cp36m/bin/pip install --upgrade cython
23-
RUN /opt/python/cp37-cp37m/bin/pip install --upgrade cython
24-
RUN /opt/python/cp38-cp38/bin/pip install --upgrade cython
25-
RUN /opt/python/cp39-cp39/bin/pip install --upgrade cython
26-
RUN /opt/python/cp310-cp310/bin/pip install --upgrade cython
27-
RUN /opt/python/cp311-cp311/bin/pip install --upgrade cython
22+
RUN /opt/python/cp36-cp36m/bin/pip install --upgrade 'cython<3.0.0rc1'
23+
RUN /opt/python/cp37-cp37m/bin/pip install --upgrade 'cython<3.0.0rc1'
24+
RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<3.0.0rc1'
25+
RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<3.0.0rc1'
26+
RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<3.0.0rc1'
27+
RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<3.0.0rc1'
2828

2929
#=================
3030
# Install ccache

‎tools/dockerfile/grpc_artifact_python_manylinux2014_x64.current_version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x64:1949ee70cc9de7ec0ed7ed3c209c0a67a3c17778@sha256:84e0b37c7f61aebff44877993ec678f0e34869e70bca651f1cbd0e46485454b4
1+
us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x64:0af99bbd5b3f24218f6009df916a19fd7cb4f11c@sha256:67ab746e6da576606ebf41ad81027ad897544445fb93d5d5ca5f9d9b5428ec84

‎tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ RUN yum update -y && yum install -y curl-devel expat-devel gettext-devel openssl
2424

2525
###################################
2626
# Install Python build requirements
27-
RUN /opt/python/cp36-cp36m/bin/pip install --upgrade cython
28-
RUN /opt/python/cp37-cp37m/bin/pip install --upgrade cython
29-
RUN /opt/python/cp38-cp38/bin/pip install --upgrade cython
30-
RUN /opt/python/cp39-cp39/bin/pip install --upgrade cython
31-
RUN /opt/python/cp310-cp310/bin/pip install --upgrade cython
32-
RUN /opt/python/cp311-cp311/bin/pip install --upgrade cython
27+
RUN /opt/python/cp36-cp36m/bin/pip install --upgrade 'cython<3.0.0rc1'
28+
RUN /opt/python/cp37-cp37m/bin/pip install --upgrade 'cython<3.0.0rc1'
29+
RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<3.0.0rc1'
30+
RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<3.0.0rc1'
31+
RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<3.0.0rc1'
32+
RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<3.0.0rc1'
3333

3434
#=================
3535
# Install ccache

‎tools/dockerfile/grpc_artifact_python_manylinux2014_x86.current_version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x86:49c7d242fed1a39ec7fe70c4be38de0cf4cb3006@sha256:c8789d88510b51b24bfaa21a91f0d21a4a5269f800bafd2c6c9626d628e93a6a
1+
us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x86:904b062b982ad12aad91173e2fc7809fd44c3924@sha256:993a963ac3985f8634951e1573d34e24b3868dfff3ad4ae4875dd2c47b73224f

‎tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ RUN yum update -y && yum install -y curl-devel expat-devel gettext-devel openssl
2424

2525
###################################
2626
# Install Python build requirements
27-
RUN /opt/python/cp36-cp36m/bin/pip install --upgrade cython
28-
RUN /opt/python/cp37-cp37m/bin/pip install --upgrade cython
29-
RUN /opt/python/cp38-cp38/bin/pip install --upgrade cython
30-
RUN /opt/python/cp39-cp39/bin/pip install --upgrade cython
31-
RUN /opt/python/cp310-cp310/bin/pip install --upgrade cython
32-
RUN /opt/python/cp311-cp311/bin/pip install --upgrade cython
27+
RUN /opt/python/cp36-cp36m/bin/pip install --upgrade 'cython<3.0.0rc1'
28+
RUN /opt/python/cp37-cp37m/bin/pip install --upgrade 'cython<3.0.0rc1'
29+
RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<3.0.0rc1'
30+
RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<3.0.0rc1'
31+
RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<3.0.0rc1'
32+
RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<3.0.0rc1'
3333

3434
#=================
3535
# Install ccache

‎tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64.current_version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_musllinux_1_1_x64:4b82ff22628795496952f54307ac84e3e82feca3@sha256:d357a7d75a41261251db35a41e8fbcef5c710e1b39d91f1c3d9503bf738b8203
1+
us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_musllinux_1_1_x64:0807f8211c3f381efa8684232c087c98a4ca7cb8@sha256:09bf18cc793d55cfc48d8e88b8b6e6914e9df2b35ec417fe77a4e20bfa251df7

‎tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ FROM quay.io/pypa/musllinux_1_1_x86_64:2022-08-29-0fd77fa
1616

1717
###################################
1818
# Install Python build requirements
19-
RUN /opt/python/cp36-cp36m/bin/pip install --upgrade cython
20-
RUN /opt/python/cp37-cp37m/bin/pip install --upgrade cython
21-
RUN /opt/python/cp38-cp38/bin/pip install --upgrade cython
22-
RUN /opt/python/cp39-cp39/bin/pip install --upgrade cython
23-
RUN /opt/python/cp310-cp310/bin/pip install --upgrade cython
24-
RUN /opt/python/cp311-cp311/bin/pip install --upgrade cython
19+
RUN /opt/python/cp36-cp36m/bin/pip install --upgrade 'cython<3.0.0rc1'
20+
RUN /opt/python/cp37-cp37m/bin/pip install --upgrade 'cython<3.0.0rc1'
21+
RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<3.0.0rc1'
22+
RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<3.0.0rc1'
23+
RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<3.0.0rc1'
24+
RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<3.0.0rc1'
2525

2626
#=================
2727
# Install ccache

‎tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86.current_version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_musllinux_1_1_x86:178208f98536cdd71ebdfff92fd81b0a8f77c326@sha256:5f323fa0e66211a8f8c836cac34e7f95eec233e0a3248ea191bb5231588c5efa
1+
us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_musllinux_1_1_x86:3bc3eacb8eb4ebce5d13a2d4ecabba9074511d48@sha256:0512449e7d218c7687eb447701c8c6a33153a722722b76b2423ec58440a027de

‎tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ FROM quay.io/pypa/musllinux_1_1_i686:2022-08-29-0fd77fa
1616

1717
###################################
1818
# Install Python build requirements
19-
RUN /opt/python/cp36-cp36m/bin/pip install --upgrade cython
20-
RUN /opt/python/cp37-cp37m/bin/pip install --upgrade cython
21-
RUN /opt/python/cp38-cp38/bin/pip install --upgrade cython
22-
RUN /opt/python/cp39-cp39/bin/pip install --upgrade cython
23-
RUN /opt/python/cp310-cp310/bin/pip install --upgrade cython
24-
RUN /opt/python/cp311-cp311/bin/pip install --upgrade cython
19+
RUN /opt/python/cp36-cp36m/bin/pip install --upgrade 'cython<3.0.0rc1'
20+
RUN /opt/python/cp37-cp37m/bin/pip install --upgrade 'cython<3.0.0rc1'
21+
RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<3.0.0rc1'
22+
RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<3.0.0rc1'
23+
RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<3.0.0rc1'
24+
RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<3.0.0rc1'
2525

2626
#=================
2727
# Install ccache

‎tools/internal_ci/helper_scripts/requirements.macos.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
cython<3.0.0rc1
12
cryptography==3.4.6
23
PyJWT==2.0.1
34
pyOpenSSL==20.0.1
4-
PyYAML==5.4.1
5+
PyYAML==6.0
56
requests==2.25.1

‎tools/run_tests/artifacts/build_artifact_python.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ set PATH=C:\msys64\mingw%2\bin;C:\tools\msys64\mingw%2\bin;%PATH%
2222
python -m pip install --upgrade six
2323
@rem some artifacts are broken for setuptools 38.5.0. See https://github.com/grpc/grpc/issues/14317
2424
python -m pip install --upgrade setuptools==44.1.1
25-
python -m pip install --upgrade cython
25+
python -m pip install --upgrade "cython<3.0.0rc1"
2626
python -m pip install -rrequirements.txt --user
2727

2828
@rem set GRPC_PYTHON_OVERRIDE_CYGWIN_DETECTION_FOR_27=1

‎tools/run_tests/artifacts/build_artifact_python.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ then
3737
# Any installation step is a potential source of breakages,
3838
# so we are trying to perform as few download-and-install operations
3939
# as possible.
40-
"${PYTHON}" -m pip install --upgrade cython
40+
"${PYTHON}" -m pip install --upgrade 'cython<3.0.0rc1'
4141
fi
4242

4343
# Allow build_ext to build C/C++ files in parallel

‎tools/run_tests/helper_scripts/build_python.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ pip_install_dir_and_deps() {
164164

165165
pip_install -U gevent
166166

167-
pip_install --upgrade cython
168-
pip_install --upgrade six protobuf>=4.21.3
167+
pip_install --upgrade 'cython<3.0.0rc1'
168+
pip_install --upgrade six 'protobuf>=4.21.3rc1,!=4.22.0.*'
169169

170170
if [ "$("$VENV_PYTHON" -c "import sys; print(sys.version_info[0])")" == "2" ]
171171
then

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy