8000 CI move to the latest cython in ci (#12829) · NicolasHug/scikit-learn@d011aed · GitHub
[go: up one dir, main page]
8000 Skip to content

Commit d011aed

Browse files
adrinjalalirth
adrinjalali
authored and
rth
committed
CI move to the latest cython in ci (scikit-learn#12829)
1 parent a50c03f commit d011aed

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

‎.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ matrix:
2323
# This environment tests that scikit-learn can be built against
2424
# versions of numpy, scipy with ATLAS that comes with Ubuntu Xenial 16.04
2525
# i.e. numpy 1.11 and scipy 0.17
26-
- env: DISTRIB="ubuntu" PYTHON_VERSION="3.5" CYTHON_VERSION="0.28.6"
26+
- env: DISTRIB="ubuntu" PYTHON_VERSION="3.5"
2727
NUMPY_VERSION="1.11.0" SCIPY_VERSION="0.17.0"
2828
PILLOW_VERSION="4.0.0" COVERAGE=true
2929
SKLEARN_SITE_JOBLIB=1 JOBLIB_VERSION="0.11"
@@ -38,12 +38,12 @@ matrix:
3838
- libatlas-dev
3939
# Python 3.5 build without SITE_JOBLIB
4040
- env: DISTRIB="conda" PYTHON_VERSION="3.5" INSTALL_MKL="false"
41-
NUMPY_VERSION="1.11.0" SCIPY_VERSION="0.17.0" CYTHON_VERSION="0.25.2"
41+
NUMPY_VERSION="1.11.0" SCIPY_VERSION="0.17.0" CYTHON_VERSION="*"
4242
PILLOW_VERSION="4.0.0" COVERAGE=true
4343
if: type != cron
4444
# Python 3.5 build
4545
- env: DISTRIB="conda" PYTHON_VERSION="3.5" INSTALL_MKL="false"
46-
NUMPY_VERSION="1.11.0" SCIPY_VERSION="0.17.0" CYTHON_VERSION="0.25.2"
46+
NUMPY_VERSION="1.11.0" SCIPY_VERSION="0.17.0" CYTHON_VERSION="*"
4747
PILLOW_VERSION="4.0.0" COVERAGE=true
4848
SKLEARN_SITE_JOBLIB=1 JOBLIB_VERSION="0.11"
4949
if: type != cron

‎build_tools/appveyor/requirements.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
numpy
22
scipy
3-
# Pin Cython to avoid bug with 0.28.x on Python 3.7
4-
cython==0.27.3
3+
cython
54
pytest
65
wheel
76
wheelhouse_uploader

‎build_tools/travis/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ elif [[ "$DISTRIB" == "ubuntu" ]]; then
7979
# and scipy
8080
virtualenv --system-site-packages --python=python3 testvenv
8181
source testvenv/bin/activate
82-
pip install pytest pytest-cov cython==$CYTHON_VERSION joblib==$JOBLIB_VERSION
82+
pip install pytest pytest-cov cython joblib==$JOBLIB_VERSION
8383

8484
elif [[ "$DISTRIB" == "scipy-dev" ]]; then
8585
make_conda python=3.7

‎sklearn/_build_utils/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
from numpy.distutils.system_info import get_info
1414

1515
DEFAULT_ROOT = 'sklearn'
16-
CYTHON_MIN_VERSION = '0.23'
16+
# on conda, this is the latest for python 3.5
17+
CYTHON_MIN_VERSION = '0.28.5'
1718

1819

1920
def get_blas_info():

0 commit comments

Comments
 (0)
0