From 83d65b84fe4e539c0b663c3ef604b9777ac12fd3 Mon Sep 17 00:00:00 2001 From: Naoya Kanai Date: Tue, 23 May 2017 18:53:37 -0700 Subject: [PATCH] Update numpy refs to 1.8.2 (#8926) --- .travis.yml | 8 ++++---- README.rst | 2 +- build_tools/travis/install.sh | 4 ---- doc/developers/advanced_installation.rst | 2 +- doc/install.rst | 2 +- setup.py | 2 +- 6 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index fc740b30e0e78..843e1ec1d4712 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,17 +29,17 @@ env: COVERAGE=true # This environment tests the oldest supported anaconda env - DISTRIB="conda" PYTHON_VERSION="2.7" INSTALL_MKL="false" - NUMPY_VERSION="1.8.1" SCIPY_VERSION="0.13.3" CYTHON_VERSION="0.23" + NUMPY_VERSION="1.8.2" SCIPY_VERSION="0.13.3" CYTHON_VERSION="0.23.4" COVERAGE=true - # This environment tests the newest supported anaconda env + # This environment tests the newest supported Anaconda release (4.3.1) # It also runs tests requiring Pandas. - DISTRIB="conda" PYTHON_VERSION="3.6" INSTALL_MKL="true" NUMPY_VERSION="1.11.2" SCIPY_VERSION="0.18.1" PANDAS_VERSION="0.19.2" CYTHON_VERSION="0.25.2" COVERAGE=true # This environment use pytest to run the tests. It uses the newest - # supported anaconda env. It also runs tests requiring Pandas. + # supported Anaconda release (4.3.1). It also runs tests requiring Pandas. - USE_PYTEST="true" DISTRIB="conda" PYTHON_VERSION="3.6" INSTALL_MKL="true" - NUMPY_VERSION="1.11.2" SCIPY_VERSION="0.18.1" PANDAS_VERSION="0.19.1" + NUMPY_VERSION="1.11.2" SCIPY_VERSION="0.18.1" PANDAS_VERSION="0.19.2" CYTHON_VERSION="0.25.2" # flake8 linting on diff wrt common ancestor with upstream/master - RUN_FLAKE8="true" SKIP_TESTS="true" diff --git a/README.rst b/README.rst index 2586523ffb2c2..64c8875be6c07 100644 --- a/README.rst +++ b/README.rst @@ -50,7 +50,7 @@ Dependencies scikit-learn requires: - Python (>= 2.7 or >= 3.3) -- NumPy (>= 1.8.1) +- NumPy (>= 1.8.2) - SciPy (>= 0.13.3) For running the examples Matplotlib >= 1.1.1 is required. diff --git a/build_tools/travis/install.sh b/build_tools/travis/install.sh index f1f60025f3486..fe0d46821e29d 100755 --- a/build_tools/travis/install.sh +++ b/build_tools/travis/install.sh @@ -45,11 +45,7 @@ if [[ "$DISTRIB" == "conda" ]]; then ${PANDAS_VERSION+pandas=$PANDAS_VERSION} else - # libgfortran=1 needs to be specified explicitly. This is a work-around for - # https://github.com/ContinuumIO/anaconda-issues/issues/445 - # with numpy=1.8.1, python=2.7 conda create -n testenv --yes python=$PYTHON_VERSION pip nose pytest \ - libgfortran=1 \ numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION \ nomkl cython=$CYTHON_VERSION \ ${PANDAS_VERSION+pandas=$PANDAS_VERSION} diff --git a/doc/developers/advanced_installation.rst b/doc/developers/advanced_installation.rst index 0ab32ea69e712..4a9e82ff17f5d 100644 --- a/doc/developers/advanced_installation.rst +++ b/doc/developers/advanced_installation.rst @@ -36,7 +36,7 @@ Installing an official release Scikit-learn requires: - Python (>= 2.7 or >= 3.3), -- NumPy (>= 1.8.1), +- NumPy (>= 1.8.2), - SciPy (>= 0.13.3). diff --git a/doc/install.rst b/doc/install.rst index c1e927f8361e0..e4240b41d857c 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -16,7 +16,7 @@ Installing the latest release Scikit-learn requires: - Python (>= 2.7 or >= 3.3), -- NumPy (>= 1.8.1), +- NumPy (>= 1.8.2), - SciPy (>= 0.13.3). If you already have a working installation of numpy and scipy, diff --git a/setup.py b/setup.py index 719a5bd695e16..7d1bb288b2a9e 100755 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ VERSION = sklearn.__version__ SCIPY_MIN_VERSION = '0.13.3' -NUMPY_MIN_VERSION = '1.8.1' +NUMPY_MIN_VERSION = '1.8.2' # Optional setuptools features