Skip to content

Commit 83d65b8

Browse files
naoyakjnothman
authored andcommitted
Update numpy refs to 1.8.2 (scikit-learn#8926)
1 parent db25f57 commit 83d65b8

File tree

6 files changed

+8
-12
lines changed

6 files changed

+8
-12
lines changed

.travis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ env:
2929
COVERAGE=true
3030
# This environment tests the oldest supported anaconda env
3131
- DISTRIB="conda" PYTHON_VERSION="2.7" INSTALL_MKL="false"
32-
NUMPY_VERSION="1.8.1" SCIPY_VERSION="0.13.3" CYTHON_VERSION="0.23"
32+
NUMPY_VERSION="1.8.2" SCIPY_VERSION="0.13.3" CYTHON_VERSION="0.23.4"
3333
COVERAGE=true
34-
# This environment tests the newest supported anaconda env
34+
# This environment tests the newest supported Anaconda release (4.3.1)
3535
# It also runs tests requiring Pandas.
3636
- DISTRIB="conda" PYTHON_VERSION="3.6" INSTALL_MKL="true"
3737
NUMPY_VERSION="1.11.2" SCIPY_VERSION="0.18.1" PANDAS_VERSION="0.19.2"
3838
CYTHON_VERSION="0.25.2" COVERAGE=true
3939
# This environment use pytest to run the tests. It uses the newest
40-
# supported anaconda env. It also runs tests requiring Pandas.
40+
# supported Anaconda release (4.3.1). It also runs tests requiring Pandas.
4141
- USE_PYTEST="true" DISTRIB="conda" PYTHON_VERSION="3.6" INSTALL_MKL="true"
42-
NUMPY_VERSION="1.11.2" SCIPY_VERSION="0.18.1" PANDAS_VERSION="0.19.1"
42+
NUMPY_VERSION="1.11.2" SCIPY_VERSION="0.18.1" PANDAS_VERSION="0.19.2"
4343
CYTHON_VERSION="0.25.2"
4444
# flake8 linting on diff wrt common ancestor with upstream/master
4545
- RUN_FLAKE8="true" SKIP_TESTS="true"

README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Dependencies
5050
scikit-learn requires:
5151

5252
- Python (>= 2.7 or >= 3.3)
53-
- NumPy (>= 1.8.1)
53+
- NumPy (>= 1.8.2)
5454
- SciPy (>= 0.13.3)
5555

5656
For running the examples Matplotlib >= 1.1.1 is required.

build_tools/travis/install.sh

-4
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,7 @@ if [[ "$DISTRIB" == "conda" ]]; then
4545
${PANDAS_VERSION+pandas=$PANDAS_VERSION}
4646

4747
else
48-
# libgfortran=1 needs to be specified explicitly. This is a work-around for
49-
# https://github.com/ContinuumIO/anaconda-issues/issues/445
50-
# with numpy=1.8.1, python=2.7
5148
conda create -n testenv --yes python=$PYTHON_VERSION pip nose pytest \
52-
libgfortran=1 \
5349
numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION \
5450
nomkl cython=$CYTHON_VERSION \
5551
${PANDAS_VERSION+pandas=$PANDAS_VERSION}

doc/developers/advanced_installation.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Installing an official release
3636
Scikit-learn requires:
3737

3838
- Python (>= 2.7 or >= 3.3),
39-
- NumPy (>= 1.8.1),
39+
- NumPy (>= 1.8.2),
4040
- SciPy (>= 0.13.3).
4141

4242

doc/install.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Installing the latest release
1616
Scikit-learn requires:
1717

1818
- Python (>= 2.7 or >= 3.3),
19-
- NumPy (>= 1.8.1),
19+
- NumPy (>= 1.8.2),
2020
- SciPy (>= 0.13.3).
2121

2222
If you already have a working installation of numpy and scipy,

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
VERSION = sklearn.__version__
4242

4343
SCIPY_MIN_VERSION = '0.13.3'
44-
NUMPY_MIN_VERSION = '1.8.1'
44+
NUMPY_MIN_VERSION = '1.8.2'
4545

4646

4747
# Optional setuptools features

0 commit comments

Comments
 (0)