Skip to content

Commit

Permalink
ARROW-2305: [Python] Bump Cython requirement to 0.27+
Browse files Browse the repository at this point in the history
Starting with Cython 0.27, it's possible to implement comparisons using `__eq__` and friends instead of `__richcmp__`: http://docs.cython.org/en/latest/src/changes.html#id16

Author: Antoine Pitrou <antoine@python.org>

Closes #1863 from pitrou/ARROW-2305-cython-027 and squashes the following commits:

c17eec3 <Antoine Pitrou> ARROW-2305:  Bump Cython requirement to 0.27+
  • Loading branch information
pitrou committed Apr 9, 2018
1 parent 1bb7fba commit f56d765
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 10 deletions.
4 changes: 1 addition & 3 deletions ci/msvc-build.bat
Expand Up @@ -68,10 +68,8 @@ if "%JOB%" == "Build_Debug" (
exit /B 0
)

@rem Note: avoid Cython 0.28.0 due to https://github.com/cython/cython/issues/2148
conda create -n arrow -q -y python=%PYTHON% ^
six pytest setuptools numpy pandas ^
cython=0.27.3 ^
six pytest setuptools numpy pandas cython ^
thrift-cpp=0.11.0

call activate arrow
Expand Down
3 changes: 1 addition & 2 deletions ci/travis_script_python.sh
Expand Up @@ -36,13 +36,12 @@ source activate $CONDA_ENV_DIR
python --version
which python

# Note: avoid Cython 0.28.0 due to https://github.com/cython/cython/issues/2148
conda install -y -q pip \
nomkl \
cloudpickle \
numpy=1.13.1 \
pandas \
cython=0.27.3
cython

# ARROW-2093: PyTorch increases the size of our conda dependency stack
# significantly, and so we have disabled these tests in Travis CI for now
Expand Down
2 changes: 1 addition & 1 deletion dev/release/verify-release-candidate.sh
Expand Up @@ -104,7 +104,7 @@ setup_miniconda() {
numpy \
pandas \
six \
cython=0.27.3 -c conda-forge
cython -c conda-forge
source activate arrow-test
}

Expand Down
2 changes: 1 addition & 1 deletion python/manylinux1/scripts/build_virtualenvs.sh
Expand Up @@ -34,7 +34,7 @@ for PYTHON_TUPLE in ${PYTHON_VERSIONS}; do

echo "=== (${PYTHON}, ${U_WIDTH}) Installing build dependencies ==="
$PIP install "numpy==1.10.4"
$PIP install "cython==0.27.3"
$PIP install "cython==0.28.1"
$PIP install "pandas==0.20.3"
$PIP install "virtualenv==15.1.0"

Expand Down
6 changes: 3 additions & 3 deletions python/setup.py
Expand Up @@ -42,8 +42,8 @@
# Check if we're running 64-bit Python
is_64_bit = sys.maxsize > 2**32

if Cython.__version__ < '0.19.1':
raise Exception('Please upgrade to Cython 0.19.1 or newer')
if Cython.__version__ < '0.27':
raise Exception('Please upgrade to Cython 0.27 or newer')

setup_dir = os.path.abspath(os.path.dirname(__file__))

Expand Down Expand Up @@ -491,7 +491,7 @@ def parse_version(root):
]
},
use_scm_version={"root": "..", "relative_to": __file__, "parse": parse_version},
setup_requires=['setuptools_scm', 'cython >= 0.23'] + setup_requires,
setup_requires=['setuptools_scm', 'cython >= 0.27'] + setup_requires,
install_requires=install_requires,
tests_require=['pytest', 'pandas'],
description="Python library for Apache Arrow",
Expand Down

0 comments on commit f56d765

Please sign in to comment.