From adffc7bfea10ae70e6e5ef39847c2ecfb3b6e77a Mon Sep 17 00:00:00 2001 From: Robert Nishihara Date: Tue, 13 Mar 2018 22:18:08 -0700 Subject: [PATCH] Pin Cython to 0.27.3 to fix travis builds. (#1718) --- .travis/install-dependencies.sh | 8 ++++---- python/build-wheel-macos.sh | 2 +- python/build-wheel-manylinux1.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis/install-dependencies.sh b/.travis/install-dependencies.sh index 87ff29119..37e2b2b2b 100755 --- a/.travis/install-dependencies.sh +++ b/.travis/install-dependencies.sh @@ -24,7 +24,7 @@ if [[ "$PYTHON" == "2.7" ]] && [[ "$platform" == "linux" ]]; then wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh -nv bash miniconda.sh -b -p $HOME/miniconda export PATH="$HOME/miniconda/bin:$PATH" - pip install -q cython cmake tensorflow gym opencv-python pyyaml pandas requests + pip install -q cython==0.27.3 cmake tensorflow gym opencv-python pyyaml pandas requests elif [[ "$PYTHON" == "3.5" ]] && [[ "$platform" == "linux" ]]; then sudo apt-get update sudo apt-get install -y cmake pkg-config python-dev python-numpy build-essential autoconf curl libtool unzip @@ -32,7 +32,7 @@ elif [[ "$PYTHON" == "3.5" ]] && [[ "$platform" == "linux" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh -nv bash miniconda.sh -b -p $HOME/miniconda export PATH="$HOME/miniconda/bin:$PATH" - pip install -q cython cmake tensorflow gym opencv-python pyyaml pandas requests + pip install -q cython==0.27.3 cmake tensorflow gym opencv-python pyyaml pandas requests elif [[ "$PYTHON" == "2.7" ]] && [[ "$platform" == "macosx" ]]; then # check that brew is installed which -s brew @@ -48,7 +48,7 @@ elif [[ "$PYTHON" == "2.7" ]] && [[ "$platform" == "macosx" ]]; then wget https://repo.continuum.io/miniconda/Miniconda2-latest-MacOSX-x86_64.sh -O miniconda.sh -nv bash miniconda.sh -b -p $HOME/miniconda export PATH="$HOME/miniconda/bin:$PATH" - pip install -q cython cmake tensorflow gym opencv-python pyyaml pandas requests + pip install -q cython==0.27.3 cmake tensorflow gym opencv-python pyyaml pandas requests elif [[ "$PYTHON" == "3.5" ]] && [[ "$platform" == "macosx" ]]; then # check that brew is installed which -s brew @@ -64,7 +64,7 @@ elif [[ "$PYTHON" == "3.5" ]] && [[ "$platform" == "macosx" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh -nv bash miniconda.sh -b -p $HOME/miniconda export PATH="$HOME/miniconda/bin:$PATH" - pip install -q cython cmake tensorflow gym opencv-python pyyaml pandas requests + pip install -q cython==0.27.3 cmake tensorflow gym opencv-python pyyaml pandas requests elif [[ "$LINT" == "1" ]]; then sudo apt-get update sudo apt-get install -y cmake build-essential autoconf curl libtool unzip diff --git a/python/build-wheel-macos.sh b/python/build-wheel-macos.sh index d28da7ebd..f7229b348 100755 --- a/python/build-wheel-macos.sh +++ b/python/build-wheel-macos.sh @@ -53,7 +53,7 @@ for ((i=0; i<${#PY_VERSIONS[@]}; ++i)); do $PIP_CMD install -q setuptools_scm # Fix the numpy version because this will be the oldest numpy version we can # support. - $PIP_CMD install -q numpy==1.10.4 cython + $PIP_CMD install -q numpy==1.10.4 cython==0.27.3 # Install wheel to avoid the error "invalid command 'bdist_wheel'". $PIP_CMD install -q wheel # Add the correct Python to the path and build the wheel. This is only diff --git a/python/build-wheel-manylinux1.sh b/python/build-wheel-manylinux1.sh index 644dd69bc..798d4bd34 100755 --- a/python/build-wheel-manylinux1.sh +++ b/python/build-wheel-manylinux1.sh @@ -21,7 +21,7 @@ for PYTHON in cp27-cp27mu cp33-cp33m cp34-cp34m cp35-cp35m cp36-cp36m; do pushd python # Fix the numpy version because this will be the oldest numpy version we can # support. - /opt/python/${PYTHON}/bin/pip install -q numpy==1.10.4 cython + /opt/python/${PYTHON}/bin/pip install -q numpy==1.10.4 cython==0.27.3 INCLUDE_UI=1 PATH=/opt/python/${PYTHON}/bin:$PATH /opt/python/${PYTHON}/bin/python setup.py bdist_wheel # In the future, run auditwheel here. mv dist/*.whl ../.whl/