Skip to content

Commit db25f57

Browse files
authored
[MRG+1] Update version dependencies to numpy 1.8.2, scipy 1.13.3 (scikit-learn#8855)
1 parent bbf4348 commit db25f57

File tree

7 files changed

+18
-13
lines changed

7 files changed

+18
-13
lines changed

.travis.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ addons:
1515
- python-scipy
1616
- libatlas3gf-base
1717
- libatlas-dev
18+
dist: trusty
1819
env:
1920
global:
2021
# Directory where tests are run from
@@ -23,17 +24,17 @@ env:
2324
- OPENBLAS_NUM_THREADS=4
2425
matrix:
2526
# This environment tests that scikit-learn can be built against
26-
# versions of numpy, scipy with ATLAS that comes with Ubuntu Precise 12.04
27+
# versions of numpy, scipy with ATLAS that comes with Ubuntu Trusty 14.04
2728
- DISTRIB="ubuntu" PYTHON_VERSION="2.7" CYTHON_VERSION="0.23.4"
2829
COVERAGE=true
2930
# This environment tests the oldest supported anaconda env
3031
- DISTRIB="conda" PYTHON_VERSION="2.7" INSTALL_MKL="false"
31-
NUMPY_VERSION="1.6.2" SCIPY_VERSION="0.11.0" CYTHON_VERSION="0.23"
32+
NUMPY_VERSION="1.8.1" SCIPY_VERSION="0.13.3" CYTHON_VERSION="0.23"
3233
COVERAGE=true
3334
# This environment tests the newest supported anaconda env
3435
# It also runs tests requiring Pandas.
3536
- DISTRIB="conda" PYTHON_VERSION="3.6" INSTALL_MKL="true"
36-
NUMPY_VERSION="1.11.2" SCIPY_VERSION="0.18.1" PANDAS_VERSION="0.19.1"
37+
NUMPY_VERSION="1.11.2" SCIPY_VERSION="0.18.1" PANDAS_VERSION="0.19.2"
3738
CYTHON_VERSION="0.25.2" COVERAGE=true
3839
# This environment use pytest to run the tests. It uses the newest
3940
# supported anaconda env. It also runs tests requiring Pandas.

README.rst

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

5252
- Python (>= 2.7 or >= 3.3)
53-
- NumPy (>= 1.6.1)
54-
- SciPy (>= 0.9)
53+
- NumPy (>= 1.8.1)
54+
- SciPy (>= 0.13.3)
5555

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

build_tools/travis/install.sh

+4
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@ 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
4851
conda create -n testenv --yes python=$PYTHON_VERSION pip nose pytest \
52+
libgfortran=1 \
4953
numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION \
5054
nomkl cython=$CYTHON_VERSION \
5155
${PANDAS_VERSION+pandas=$PANDAS_VERSION}

doc/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,8 @@
239239
'reference_url': {
240240
'sklearn': None,
241241
'matplotlib': 'http://matplotlib.org',
242-
'numpy': 'http://docs.scipy.org/doc/numpy-1.6.0',
243-
'scipy': 'http://docs.scipy.org/doc/scipy-0.11.0/reference'},
242+
'numpy': 'http://docs.scipy.org/doc/numpy-1.8.1',
243+
'scipy': 'http://docs.scipy.org/doc/scipy-0.13.3/reference'},
244244
'expected_failing_examples': [
245245
'../examples/applications/plot_stock_market.py']
246246
}

doc/developers/advanced_installation.rst

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

3838
- Python (>= 2.7 or >= 3.3),
39-
- NumPy (>= 1.6.1),
40-
- SciPy (>= 0.9).
39+
- NumPy (>= 1.8.1),
40+
- SciPy (>= 0.13.3).
4141

4242

4343
Mac OSX

doc/install.rst

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

1818
- Python (>= 2.7 or >= 3.3),
19-
- NumPy (>= 1.6.1),
20-
- SciPy (>= 0.9).
19+
- NumPy (>= 1.8.1),
20+
- SciPy (>= 0.13.3).
2121

2222
If you already have a working installation of numpy and scipy,
2323
the easiest way to install scikit-learn is using ``pip`` ::

setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040

4141
VERSION = sklearn.__version__
4242

43-
SCIPY_MIN_VERSION = '0.9'
44-
NUMPY_MIN_VERSION = '1.6.1'
43+
SCIPY_MIN_VERSION = '0.13.3'
44+
NUMPY_MIN_VERSION = '1.8.1'
4545

4646

4747
# Optional setuptools features

0 commit comments

Comments
 (0)