Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #21451 from lidizheng/upgrade-cython

Browse Source 
Upgrade the Cython version whenever we can
pull/21469/head
Lidi Zheng 5 years ago committed by GitHub
parent f7661524bb bf3a5c2478
commit 1550e10fd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 44 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      tools/dockerfile/grpc_artifact_python_manylinux1_x64/Dockerfile
  2. 16
      tools/dockerfile/grpc_artifact_python_manylinux1_x86/Dockerfile
  3. 16
      tools/dockerfile/grpc_artifact_python_manylinux2010_x64/Dockerfile
  4. 16
      tools/dockerfile/grpc_artifact_python_manylinux2010_x86/Dockerfile
  5. 10
      tools/internal_ci/macos/grpc_build_artifacts.sh
  6. 2
      tools/run_tests/artifacts/build_artifact_python.bat
  7. 3
      tools/run_tests/artifacts/build_artifact_python.sh
  8. 8
      tools/run_tests/helper_scripts/build_python.sh

14
tools/dockerfile/grpc_artifact_python_manylinux1_x64/Dockerfile
Unescape View File

@ -22,10 +22,10 @@ RUN yum install -y curl-devel expat-devel gettext-devel linux-headers openssl-de
###################################
# Install Python build requirements
RUN /opt/python/cp27-cp27m/bin/pip install cython
RUN /opt/python/cp27-cp27mu/bin/pip install cython
RUN /opt/python/cp34-cp34m/bin/pip install cython
RUN /opt/python/cp35-cp35m/bin/pip install cython
RUN /opt/python/cp36-cp36m/bin/pip install cython
RUN /opt/python/cp37-cp37m/bin/pip install cython
RUN /opt/python/cp38-cp38/bin/pip install cython
RUN /opt/python/cp27-cp27m/bin/pip install --upgrade cython
RUN /opt/python/cp27-cp27mu/bin/pip install --upgrade cython
RUN /opt/python/cp34-cp34m/bin/pip install --upgrade cython
RUN /opt/python/cp35-cp35m/bin/pip install --upgrade cython
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

16
tools/dockerfile/grpc_artifact_python_manylinux1_x86/Dockerfile
Unescape View File

@ -22,11 +22,11 @@ RUN yum install -y curl-devel expat-devel gettext-devel linux-headers openssl-de
###################################
# Install Python build requirements
RUN /opt/python/cp27-cp27m/bin/pip install cython
RUN /opt/python/cp27-cp27mu/bin/pip install cython
RUN /opt/python/cp34-cp34m/bin/pip install cython
RUN /opt/python/cp35-cp35m/bin/pip install cython
RUN /opt/python/cp36-cp36m/bin/pip install cython
RUN /opt/python/cp37-cp37m/bin/pip install cython
RUN /opt/python/cp37-cp37m/bin/pip install cython
RUN /opt/python/cp38-cp38/bin/pip install cython
RUN /opt/python/cp27-cp27m/bin/pip install --upgrade cython
RUN /opt/python/cp27-cp27mu/bin/pip install --upgrade cython
RUN /opt/python/cp34-cp34m/bin/pip install --upgrade cython
RUN /opt/python/cp35-cp35m/bin/pip install --upgrade cython
RUN /opt/python/cp36-cp36m/bin/pip install --upgrade cython
RUN /opt/python/cp37-cp37m/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

16
tools/dockerfile/grpc_artifact_python_manylinux2010_x64/Dockerfile
Unescape View File

@ -22,11 +22,11 @@ RUN yum install -y curl-devel expat-devel gettext-devel linux-headers openssl-de
###################################
# Install Python build requirements
RUN /opt/python/cp27-cp27m/bin/pip install cython
RUN /opt/python/cp27-cp27mu/bin/pip install cython
RUN /opt/python/cp34-cp34m/bin/pip install cython
RUN /opt/python/cp35-cp35m/bin/pip install cython
RUN /opt/python/cp36-cp36m/bin/pip install cython
RUN /opt/python/cp37-cp37m/bin/pip install cython
RUN /opt/python/cp37-cp37m/bin/pip install cython
RUN /opt/python/cp38-cp38/bin/pip install cython
RUN /opt/python/cp27-cp27m/bin/pip install --upgrade cython
RUN /opt/python/cp27-cp27mu/bin/pip install --upgrade cython
RUN /opt/python/cp34-cp34m/bin/pip install --upgrade cython
RUN /opt/python/cp35-cp35m/bin/pip install --upgrade cython
RUN /opt/python/cp36-cp36m/bin/pip install --upgrade cython
RUN /opt/python/cp37-cp37m/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

16
tools/dockerfile/grpc_artifact_python_manylinux2010_x86/Dockerfile
Unescape View File

@ -22,11 +22,11 @@ RUN yum install -y curl-devel expat-devel gettext-devel linux-headers openssl-de
###################################
# Install Python build requirements
RUN /opt/python/cp27-cp27m/bin/pip install cython
RUN /opt/python/cp27-cp27mu/bin/pip install cython
RUN /opt/python/cp34-cp34m/bin/pip install cython
RUN /opt/python/cp35-cp35m/bin/pip install cython
RUN /opt/python/cp36-cp36m/bin/pip install cython
RUN /opt/python/cp37-cp37m/bin/pip install cython
RUN /opt/python/cp37-cp37m/bin/pip install cython
RUN /opt/python/cp38-cp38/bin/pip install cython
RUN /opt/python/cp27-cp27m/bin/pip install --upgrade cython
RUN /opt/python/cp27-cp27mu/bin/pip install --upgrade cython
RUN /opt/python/cp34-cp34m/bin/pip install --upgrade cython
RUN /opt/python/cp35-cp35m/bin/pip install --upgrade cython
RUN /opt/python/cp36-cp36m/bin/pip install --upgrade cython
RUN /opt/python/cp37-cp37m/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

10
tools/internal_ci/macos/grpc_build_artifacts.sh
Unescape View File

@ -21,11 +21,11 @@ cd $(dirname $0)/../../..
source tools/internal_ci/helper_scripts/prepare_build_macos_rc
# install cython for all python versions
python2.7 -m pip install cython setuptools wheel
python3.5 -m pip install cython setuptools wheel
python3.6 -m pip install cython setuptools wheel
python3.7 -m pip install cython setuptools wheel
python3.8 -m pip install cython setuptools wheel
python2.7 -m pip install -U cython setuptools wheel --user
python3.5 -m pip install -U cython setuptools wheel --user
python3.6 -m pip install -U cython setuptools wheel --user
python3.7 -m pip install -U cython setuptools wheel --user
python3.8 -m pip install -U cython setuptools wheel --user
# needed to build ruby artifacts
time bash tools/distrib/build_ruby_environment_macos.sh

2
tools/run_tests/artifacts/build_artifact_python.bat
Unescape View File

@ -19,7 +19,7 @@ python -m pip install --upgrade six
@rem some artifacts are broken for setuptools 38.5.0. See https://github.com/grpc/grpc/issues/14317
python -m pip install --upgrade setuptools==38.2.4
python -m pip install --upgrade cython
python -m pip install -rrequirements.txt
python -m pip install -rrequirements.txt --user
set GRPC_PYTHON_BUILD_WITH_CYTHON=1

3
tools/run_tests/artifacts/build_artifact_python.sh
Unescape View File

@ -22,6 +22,9 @@ export PYTHON=${PYTHON:-python}
export PIP=${PIP:-pip}
export AUDITWHEEL=${AUDITWHEEL:-auditwheel}
# Install Cython to avoid source wheel build failure.
"${PIP}" install --upgrade cython
# Allow build_ext to build C/C++ files in parallel
# by enabling a monkeypatch. It speeds up the build a lot.
# Use externally provided GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS value if set.

8
tools/run_tests/helper_scripts/build_python.sh
Unescape View File

@ -175,10 +175,10 @@ case "$VENV" in
;;
esac
$VENV_PYTHON -m pip install --upgrade pip==10.0.1
$VENV_PYTHON -m pip install setuptools
$VENV_PYTHON -m pip install cython
$VENV_PYTHON -m pip install six enum34 protobuf
$VENV_PYTHON -m pip install --upgrade pip
$VENV_PYTHON -m pip install --upgrade setuptools
$VENV_PYTHON -m pip install --upgrade cython
$VENV_PYTHON -m pip install --upgrade six enum34 protobuf
if [ "$("$VENV_PYTHON" -c "import sys; print(sys.version_info[0])")" == "2" ]
then

Write Preview
Loading…
Cancel
Save