File tree 7 files changed +18
-13
lines changed
7 files changed +18
-13
lines changed Original file line number Diff line number Diff line change @@ -15,6 +15,7 @@ addons:
15
15
- python-scipy
16
16
- libatlas3gf-base
17
17
- libatlas-dev
18
+ dist : trusty
18
19
env :
19
20
global :
20
21
# Directory where tests are run from
23
24
- OPENBLAS_NUM_THREADS=4
24
25
matrix :
25
26
# 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
27
28
- DISTRIB="ubuntu" PYTHON_VERSION="2.7" CYTHON_VERSION="0.23.4"
28
29
COVERAGE=true
29
30
# This environment tests the oldest supported anaconda env
30
31
- 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"
32
33
COVERAGE=true
33
34
# This environment tests the newest supported anaconda env
34
35
# It also runs tests requiring Pandas.
35
36
- 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 "
37
38
CYTHON_VERSION="0.25.2" COVERAGE=true
38
39
# This environment use pytest to run the tests. It uses the newest
39
40
# supported anaconda env. It also runs tests requiring Pandas.
Original file line number Diff line number Diff line change @@ -50,8 +50,8 @@ Dependencies
50
50
scikit-learn requires:
51
51
52
52
- 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 )
55
55
56
56
For running the examples Matplotlib >= 1.1.1 is required.
57
57
Original file line number Diff line number Diff line change @@ -45,7 +45,11 @@ if [[ "$DISTRIB" == "conda" ]]; then
45
45
${PANDAS_VERSION+pandas=$PANDAS_VERSION }
46
46
47
47
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
48
51
conda create -n testenv --yes python=$PYTHON_VERSION pip nose pytest \
52
+ libgfortran=1 \
49
53
numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION \
50
54
nomkl cython=$CYTHON_VERSION \
51
55
${PANDAS_VERSION+pandas=$PANDAS_VERSION }
Original file line number Diff line number Diff line change 239
239
'reference_url' : {
240
240
'sklearn' : None ,
241
241
'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' },
244
244
'expected_failing_examples' : [
245
245
'../examples/applications/plot_stock_market.py' ]
246
246
}
Original file line number Diff line number Diff line change @@ -36,8 +36,8 @@ Installing an official release
36
36
Scikit-learn requires:
37
37
38
38
- 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 ).
41
41
42
42
43
43
Mac OSX
Original file line number Diff line number Diff line change @@ -16,8 +16,8 @@ Installing the latest release
16
16
Scikit-learn requires:
17
17
18
18
- 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 ).
21
21
22
22
If you already have a working installation of numpy and scipy,
23
23
the easiest way to install scikit-learn is using ``pip `` ::
Original file line number Diff line number Diff line change 40
40
41
41
VERSION = sklearn .__version__
42
42
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'
45
45
46
46
47
47
# Optional setuptools features
You can’t perform that action at this time.
0 commit comments