10000 MAINT upgrade travis config with most recent conda deps · scikit-learn/scikit-learn@a44750b · GitHub
[go: up one dir, main page]
Skip to content

Commit a44750b

Browse files
ogriselogrisel
committed
MAINT upgrade travis config with most recent conda deps
1 parent b264234 commit a44750b

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

‎.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ env:
3333
NUMPY_VERSION="1.6.2" SCIPY_VERSION="0.11.0" CYTHON_VERSION="0.23"
3434
# This environment tests the newest supported anaconda env
3535
# It also runs tests requiring Pandas.
36-
- DISTRIB="conda" PYTHON_VERSION="3.5" INSTALL_MKL="true"
37-
NUMPY_VERSION="1.10.4" SCIPY_VERSION="0.17.0" PANDAS_VERSION="0.18.0"
38-
CYTHON_VERSION="0.23.4"
36+
- DISTRIB="conda" PYTHON_VERSION="3.6" INSTALL_MKL="true"
37+
NUMPY_VERSION="1.11.2" SCIPY_VERSION="0.18.1" PANDAS_VERSION="0.19.1"
38+
CYTHON_VERSION="0.25.2"
3939
# flake8 linting on diff wrt common ancestor with upstream/master
4040
- RUN_FLAKE8="true" SKIP_TESTS="true"
4141
DISTRIB="conda" PYTHON_VERSION="3.5" INSTALL_MKL="true"

‎build_tools/travis/install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ if [[ "$DISTRIB" == "conda" ]]; then
5252
# provided versions
5353
if [[ "$INSTALL_MKL" == "true" ]]; then
5454
conda create -n testenv --yes python=$PYTHON_VERSION pip nose \
55-
numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION numpy scipy \
56-
mkl flake8 cython=$CYTHON_VERSION \
55+
numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION \
56+
mkl cython=$CYTHON_VERSION \
5757
${PANDAS_VERSION+pandas=$PANDAS_VERSION}
5858

5959
else

0 commit comments

Comments
 (0)
0