Skip to content

Commit

Permalink
Upgrade cython to 0.29.26 for py310 (ray-project#21244)
Browse files Browse the repository at this point in the history
  • Loading branch information
acxz authored Dec 27, 2021
1 parent 0b9cdb1 commit cbcd03b
Show file tree
Hide file tree
Showing 14 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .gitpod/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN set -x; apt update \
&& mv bazel.gpg /etc/apt/trusted.gpg.d/ \
&& echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list \
&& apt update && apt install bazel-3.7.2 -y \
&& pip3 install cython==0.29.0 pytest pandas tree tabulate pexpect sklearn joblib yapf==0.23.0 flake8==3.9.1 mypy==0.782 flake8-quotes flake8-bugbear==21.9.2 setproctitle==1.1.10 psutil \
&& pip3 install cython==0.29.26 pytest pandas tree tabulate pexpect sklearn joblib yapf==0.23.0 flake8==3.9.1 mypy==0.782 flake8-quotes flake8-bugbear==21.9.2 setproctitle==1.1.10 psutil \
&& python3 -c 'print("startup --output_base=/workspace/ray/.bazel-cache\nstartup --host_jvm_args=-Xmx1800m\nbuild --jobs=6")' > /etc/bazel.bazelrc

RUN update-alternatives --install /usr/local/bin/python python /usr/bin/python3 30 \
Expand Down
4 changes: 2 additions & 2 deletions bazel/ray_deps_setup.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ def ray_deps_setup():
auto_http_archive(
name = "cython",
build_file = True,
url = "https://github.com/cython/cython/archive/26cb654dcf4ed1b1858daf16b39fd13406b1ac64.tar.gz",
sha256 = "d21e155ac9a455831f81608bb06620e4a1d75012a630faf11f4c25ad10cfc9bb",
url = "https://github.com/cython/cython/archive/3028e8c7ac296bc848d996e397c3354b3dbbd431.tar.gz",
sha256 = "31ea23c2231ddee8572a2a5effd54952e16a1b44e9a4cb3eb645418f8accf20d",
)

auto_http_archive(
Expand Down
2 changes: 1 addition & 1 deletion ci/asan_tests/ray-project/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ aiohttp
aiosignal
blist
boto3
cython==0.29.0
cython==0.29.26
dataclasses; python_version < '3.7'
dm-tree==0.1.5
feather-format
Expand Down
8 changes: 4 additions & 4 deletions doc/source/development.rst
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ For Ubuntu, run the following commands:
sudo apt-get update
sudo apt-get install -y build-essential curl unzip psmisc
pip install cython==0.29.0 pytest
pip install cython==0.29.26 pytest
For RHELv8 (Redhat EL 8.0-64 Minimal), run the following commands:

Expand All @@ -76,7 +76,7 @@ For RHELv8 (Redhat EL 8.0-64 Minimal), run the following commands:
sudo yum groupinstall 'Development Tools'
sudo yum install psmisc
pip install cython==0.29.0 pytest
pip install cython==0.29.26 pytest
Install bazel manually from link: https://docs.bazel.build/versions/main/install-redhat.html

Expand All @@ -91,7 +91,7 @@ For MacOS, run the following commands:
brew update
brew install wget
pip install cython==0.29.0 pytest
pip install cython==0.29.26 pytest
Ray can be built from the repository as follows.

Expand Down Expand Up @@ -193,7 +193,7 @@ Define an environment variable BAZEL_PATH to full exe path (example:

.. code-block:: shell
pip install cython==0.29.0 pytest
pip install cython==0.29.26 pytest
6. Download ray source code and build it.

Expand Down
2 changes: 1 addition & 1 deletion docker/base-deps/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ RUN sudo apt-get update -y && sudo apt-get upgrade -y \
&& $HOME/anaconda3/bin/conda clean -y --all \
&& $HOME/anaconda3/bin/pip install --no-cache-dir \
flatbuffers \
cython==0.29.23 \
cython==0.29.26 \
# Necessary for Dataset to work properly.
numpy\>=1.20 \
psutil \
Expand Down
2 changes: 1 addition & 1 deletion docker/ray-worker-container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ RUN apt-get update -y && sudo apt-get upgrade -y \
&& $HOME/anaconda3/bin/conda clean -y --all \
&& $HOME/anaconda3/bin/pip install --no-cache-dir \
flatbuffers \
cython==0.29.0 \
cython==0.29.26 \
numpy==1.15.4 \
psutil \
blist \
Expand Down
2 changes: 1 addition & 1 deletion python/build-wheel-macos-arm64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ for ((i=0; i<${#PY_VERSIONS[@]}; ++i)); do
# Setuptools on CentOS is too old to install arrow 0.9.0, therefore we upgrade.
# TODO: Unpin after https://github.com/pypa/setuptools/issues/2849 is fixed.
$PIP_CMD install --upgrade setuptools==58.4
$PIP_CMD install -q cython==0.29.15
$PIP_CMD install -q cython==0.29.26
# Install wheel to avoid the error "invalid command 'bdist_wheel'".
$PIP_CMD install -q wheel
# Set the commit SHA in __init__.py.
Expand Down
2 changes: 1 addition & 1 deletion python/build-wheel-macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ for ((i=0; i<${#PY_VERSIONS[@]}; ++i)); do
$PIP_CMD install -q setuptools_scm==3.1.0
# Fix the numpy version because this will be the oldest numpy version we can
# support.
$PIP_CMD install -q numpy=="$NUMPY_VERSION" cython==0.29.15
$PIP_CMD install -q numpy=="$NUMPY_VERSION" cython==0.29.26
# Install wheel to avoid the error "invalid command 'bdist_wheel'".
$PIP_CMD install -q wheel
# Set the commit SHA in __init__.py.
Expand Down
2 changes: 1 addition & 1 deletion python/build-wheel-manylinux2014.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ for ((i=0; i<${#PYTHONS[@]}; ++i)); 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=="${NUMPY_VERSION}" cython==0.29.15
/opt/python/"${PYTHON}"/bin/pip install -q numpy=="${NUMPY_VERSION}" cython==0.29.26
# Set the commit SHA in __init__.py.
if [ -n "$TRAVIS_COMMIT" ]; then
sed -i.bak "s/{{RAY_COMMIT_SHA}}/$TRAVIS_COMMIT/g" ray/__init__.py && rm ray/__init__.py.bak
Expand Down
2 changes: 1 addition & 1 deletion python/ray/autoscaler/aws/development-example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ setup_commands:
- git clone https://github.com/ray-project/ray || true
- ray/ci/travis/install-bazel.sh
- cd ray/python/ray/dashboard/client; npm ci; npm run build
- pip install boto3==1.4.8 cython==0.29.0 aiohttp grpcio psutil setproctitle
- pip install boto3==1.4.8 cython==0.29.26 aiohttp grpcio psutil setproctitle
- cd ray/python; pip install -e . --verbose

# Custom commands that will be run on the head node after common setup.
Expand Down
2 changes: 1 addition & 1 deletion python/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ azure-mgmt-network==19.0.0
azure-mgmt-resource==20.0.0
msrestazure==0.6.4
boto3
cython >= 0.29.15
cython >= 0.29.26
dataclasses; python_version < '3.7'
feather-format
google-api-python-client
Expand Down
2 changes: 1 addition & 1 deletion python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ def has_ext_modules(self):
# The BinaryDistribution argument triggers build_ext.
distclass=BinaryDistribution,
install_requires=setup_spec.install_requires,
setup_requires=["cython >= 0.29.15", "wheel"],
setup_requires=["cython >= 0.29.26", "wheel"],
extras_require=setup_spec.extras,
entry_points={
"console_scripts": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ python:
pip_packages:
- terminado
- boto3
- cython==0.29.0
- cython==0.29.26
conda_packages: []

post_build_cmds:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
subprocess.run("sudo apt-get update".split(" "))
subprocess.run("sudo apt-get install -y build-essential curl unzip "
"psmisc".split(" "))
subprocess.run("pip install cython==0.29.0 pytest".split(" "))
subprocess.run("pip install cython==0.29.26 pytest".split(" "))
# Assume we are in the ray (git clone) directory.
try:
subprocess.run("pip uninstall -y ray".split(" "))
Expand Down

0 comments on commit cbcd03b

Please sign in to comment.