aboutsummaryrefslogtreecommitdiff
path: root/tools/dockerfile
diff options
context:
space:
mode:
authorRichard Belleville <rbellevi@google.com>2023-07-18 12:56:16 -0700
committerGitHub <noreply@github.com>2023-07-18 12:56:16 -0700
commitd714ae72e798dfde03ce55b709465fbb71f39fa6 (patch)
tree804b6b731db87a1f1d8a013b07bc129989c00a26 /tools/dockerfile
parentd779808e012d925782b225493c210e268fcd4084 (diff)
downloadgrpc-grpc-d714ae72e798dfde03ce55b709465fbb71f39fa6.tar.gz
[dependency] Restrict cython to less than 3.X (#33738)
This should resolve breakage on master caused by the jump to Cython 3.0.0 this morning.
Diffstat (limited to 'tools/dockerfile')
-rwxr-xr-xtools/dockerfile/grpc_artifact_python_linux_armv7/install_python_for_wheel_crosscompilation.sh2
-rw-r--r--tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64.current_version2
-rw-r--r--tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile12
-rw-r--r--tools/dockerfile/grpc_artifact_python_manylinux2014_x64.current_version2
-rw-r--r--tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile12
-rw-r--r--tools/dockerfile/grpc_artifact_python_manylinux2014_x86.current_version2
-rw-r--r--tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile12
-rw-r--r--tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64.current_version2
-rw-r--r--tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile12
-rw-r--r--tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86.current_version2
-rw-r--r--tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile12
11 files changed, 36 insertions, 36 deletions
diff --git a/tools/dockerfile/grpc_artifact_python_linux_armv7/install_python_for_wheel_crosscompilation.sh b/tools/dockerfile/grpc_artifact_python_linux_armv7/install_python_for_wheel_crosscompilation.sh
index b5f9a56a57..08c6439d36 100755
--- a/tools/dockerfile/grpc_artifact_python_linux_armv7/install_python_for_wheel_crosscompilation.sh
+++ b/tools/dockerfile/grpc_artifact_python_linux_armv7/install_python_for_wheel_crosscompilation.sh
@@ -44,4 +44,4 @@ popd
rm -rf "Python-${PYTHON_VERSION}"
# install cython and wheel
-"${PYTHON_PREFIX}/bin/python3" -m pip install --upgrade cython wheel
+"${PYTHON_PREFIX}/bin/python3" -m pip install --upgrade 'cython<3.0.0rc1' wheel
diff --git a/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64.current_version b/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64.current_version
index 0e79fda49d..59a73a20c4 100644
--- a/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64.current_version
+++ b/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64.current_version
@@ -1 +1 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_aarch64:8f31a9a0d9098577fa01bacbfc2940e7894fa0bd@sha256:9ea49947ec64337cdd40086912b59ace394179f87cf42531a077c5e5b86c1fe0 \ No newline at end of file
+us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_aarch64:6e2cf9602baccda05d82402885660e028cc3ebc6@sha256:d56ea4394ea5ea9d09f940d1dba31e6196a8e919f60c6a4966a9192faa997f11
diff --git a/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile
index f1648cd1bf..db73c543fc 100644
--- a/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile
+++ b/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile
@@ -19,12 +19,12 @@ ENV AUDITWHEEL_PLAT manylinux_2_17_$AUDITWHEEL_ARCH
###################################
# Install Python build requirements
-RUN /opt/python/cp36-cp36m/bin/pip install --upgrade cython
-RUN /opt/python/cp37-cp37m/bin/pip install --upgrade cython
-RUN /opt/python/cp38-cp38/bin/pip install --upgrade cython
-RUN /opt/python/cp39-cp39/bin/pip install --upgrade cython
-RUN /opt/python/cp310-cp310/bin/pip install --upgrade cython
-RUN /opt/python/cp311-cp311/bin/pip install --upgrade cython
+RUN /opt/python/cp36-cp36m/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp37-cp37m/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<3.0.0rc1'
#=================
# Install ccache
diff --git a/tools/dockerfile/grpc_artifact_python_manylinux2014_x64.current_version b/tools/dockerfile/grpc_artifact_python_manylinux2014_x64.current_version
index a9c42de4b0..80f2efc75f 100644
--- a/tools/dockerfile/grpc_artifact_python_manylinux2014_x64.current_version
+++ b/tools/dockerfile/grpc_artifact_python_manylinux2014_x64.current_version
@@ -1 +1 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x64:1949ee70cc9de7ec0ed7ed3c209c0a67a3c17778@sha256:84e0b37c7f61aebff44877993ec678f0e34869e70bca651f1cbd0e46485454b4 \ No newline at end of file
+us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x64:0af99bbd5b3f24218f6009df916a19fd7cb4f11c@sha256:67ab746e6da576606ebf41ad81027ad897544445fb93d5d5ca5f9d9b5428ec84 \ No newline at end of file
diff --git a/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile
index ffccd995a7..e9f8c534c1 100644
--- a/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile
+++ b/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile
@@ -24,12 +24,12 @@ RUN yum update -y && yum install -y curl-devel expat-devel gettext-devel openssl
###################################
# Install Python build requirements
-RUN /opt/python/cp36-cp36m/bin/pip install --upgrade cython
-RUN /opt/python/cp37-cp37m/bin/pip install --upgrade cython
-RUN /opt/python/cp38-cp38/bin/pip install --upgrade cython
-RUN /opt/python/cp39-cp39/bin/pip install --upgrade cython
-RUN /opt/python/cp310-cp310/bin/pip install --upgrade cython
-RUN /opt/python/cp311-cp311/bin/pip install --upgrade cython
+RUN /opt/python/cp36-cp36m/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp37-cp37m/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<3.0.0rc1'
#=================
# Install ccache
diff --git a/tools/dockerfile/grpc_artifact_python_manylinux2014_x86.current_version b/tools/dockerfile/grpc_artifact_python_manylinux2014_x86.current_version
index a7e51e7ecd..60ded4cf1e 100644
--- a/tools/dockerfile/grpc_artifact_python_manylinux2014_x86.current_version
+++ b/tools/dockerfile/grpc_artifact_python_manylinux2014_x86.current_version
@@ -1 +1 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x86:49c7d242fed1a39ec7fe70c4be38de0cf4cb3006@sha256:c8789d88510b51b24bfaa21a91f0d21a4a5269f800bafd2c6c9626d628e93a6a \ No newline at end of file
+us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x86:904b062b982ad12aad91173e2fc7809fd44c3924@sha256:993a963ac3985f8634951e1573d34e24b3868dfff3ad4ae4875dd2c47b73224f \ No newline at end of file
diff --git a/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile
index 052c196672..c5435575fc 100644
--- a/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile
+++ b/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile
@@ -24,12 +24,12 @@ RUN yum update -y && yum install -y curl-devel expat-devel gettext-devel openssl
###################################
# Install Python build requirements
-RUN /opt/python/cp36-cp36m/bin/pip install --upgrade cython
-RUN /opt/python/cp37-cp37m/bin/pip install --upgrade cython
-RUN /opt/python/cp38-cp38/bin/pip install --upgrade cython
-RUN /opt/python/cp39-cp39/bin/pip install --upgrade cython
-RUN /opt/python/cp310-cp310/bin/pip install --upgrade cython
-RUN /opt/python/cp311-cp311/bin/pip install --upgrade cython
+RUN /opt/python/cp36-cp36m/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp37-cp37m/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<3.0.0rc1'
#=================
# Install ccache
diff --git a/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64.current_version b/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64.current_version
index 1fd70005a1..0393c743da 100644
--- a/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64.current_version
+++ b/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64.current_version
@@ -1 +1 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_musllinux_1_1_x64:4b82ff22628795496952f54307ac84e3e82feca3@sha256:d357a7d75a41261251db35a41e8fbcef5c710e1b39d91f1c3d9503bf738b8203 \ No newline at end of file
+us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_musllinux_1_1_x64:0807f8211c3f381efa8684232c087c98a4ca7cb8@sha256:09bf18cc793d55cfc48d8e88b8b6e6914e9df2b35ec417fe77a4e20bfa251df7 \ No newline at end of file
diff --git a/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile b/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile
index c0166713d3..b19d6ca28a 100644
--- a/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile
+++ b/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile
@@ -16,12 +16,12 @@ FROM quay.io/pypa/musllinux_1_1_x86_64:2022-08-29-0fd77fa
###################################
# Install Python build requirements
-RUN /opt/python/cp36-cp36m/bin/pip install --upgrade cython
-RUN /opt/python/cp37-cp37m/bin/pip install --upgrade cython
-RUN /opt/python/cp38-cp38/bin/pip install --upgrade cython
-RUN /opt/python/cp39-cp39/bin/pip install --upgrade cython
-RUN /opt/python/cp310-cp310/bin/pip install --upgrade cython
-RUN /opt/python/cp311-cp311/bin/pip install --upgrade cython
+RUN /opt/python/cp36-cp36m/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp37-cp37m/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<3.0.0rc1'
#=================
# Install ccache
diff --git a/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86.current_version b/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86.current_version
index b3583c8cc5..4c64f34c70 100644
--- a/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86.current_version
+++ b/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86.current_version
@@ -1 +1 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_musllinux_1_1_x86:178208f98536cdd71ebdfff92fd81b0a8f77c326@sha256:5f323fa0e66211a8f8c836cac34e7f95eec233e0a3248ea191bb5231588c5efa \ No newline at end of file
+us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_musllinux_1_1_x86:3bc3eacb8eb4ebce5d13a2d4ecabba9074511d48@sha256:0512449e7d218c7687eb447701c8c6a33153a722722b76b2423ec58440a027de \ No newline at end of file
diff --git a/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile b/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile
index 9b9553d8dc..0384dfa1fe 100644
--- a/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile
+++ b/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile
@@ -16,12 +16,12 @@ FROM quay.io/pypa/musllinux_1_1_i686:2022-08-29-0fd77fa
###################################
# Install Python build requirements
-RUN /opt/python/cp36-cp36m/bin/pip install --upgrade cython
-RUN /opt/python/cp37-cp37m/bin/pip install --upgrade cython
-RUN /opt/python/cp38-cp38/bin/pip install --upgrade cython
-RUN /opt/python/cp39-cp39/bin/pip install --upgrade cython
-RUN /opt/python/cp310-cp310/bin/pip install --upgrade cython
-RUN /opt/python/cp311-cp311/bin/pip install --upgrade cython
+RUN /opt/python/cp36-cp36m/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp37-cp37m/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<3.0.0rc1'
#=================
# Install ccache