File tree 6 files changed +8
-12
lines changed
6 files changed +8
-12
lines changed Original file line number Diff line number Diff line change 29
29
COVERAGE=true
30
30
# This environment tests the oldest supported anaconda env
31
31
- 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 "
33
33
COVERAGE=true
34
- # This environment tests the newest supported anaconda env
34
+ # This environment tests the newest supported Anaconda release (4.3.1)
35
35
# It also runs tests requiring Pandas.
36
36
- DISTRIB="conda" PYTHON_VERSION="3.6" INSTALL_MKL="true"
37
37
NUMPY_VERSION="1.11.2" SCIPY_VERSION="0.18.1" PANDAS_VERSION="0.19.2"
38
38
CYTHON_VERSION="0.25.2" COVERAGE=true
39
39
# 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.
41
41
- 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 "
43
43
CYTHON_VERSION="0.25.2"
44
44
# flake8 linting on diff wrt common ancestor with upstream/master
45
45
- RUN_FLAKE8="true" SKIP_TESTS="true"
Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ Dependencies
50
50
scikit-learn requires:
51
51
52
52
- Python (>= 2.7 or >= 3.3)
53
- - NumPy (>= 1.8.1 )
53
+ - NumPy (>= 1.8.2 )
54
54
- SciPy (>= 0.13.3)
55
55
56
56
For running the examples Matplotlib >= 1.1.1 is required.
Original file line number Diff line number Diff line change @@ -45,11 +45,7 @@ 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
51
48
conda create -n testenv --yes python=$PYTHON_VERSION pip nose pytest \
52
- libgfortran=1 \
53
49
numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION \
54
50
nomkl cython=$CYTHON_VERSION \
55
51
${PANDAS_VERSION+pandas=$PANDAS_VERSION }
Original file line number Diff line number Diff line change @@ -36,7 +36,7 @@ Installing an official release
36
36
Scikit-learn requires:
37
37
38
38
- Python (>= 2.7 or >= 3.3),
39
- - NumPy (>= 1.8.1 ),
39
+ - NumPy (>= 1.8.2 ),
40
40
- SciPy (>= 0.13.3).
41
41
42
42
Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ Installing the latest release
16
16
Scikit-learn requires:
17
17
18
18
- Python (>= 2.7 or >= 3.3),
19
- - NumPy (>= 1.8.1 ),
19
+ - NumPy (>= 1.8.2 ),
20
20
- SciPy (>= 0.13.3).
21
21
22
22
If you already have a working installation of numpy and scipy,
Original file line number Diff line number Diff line change 41
41
VERSION = sklearn .__version__
42
42
43
43
SCIPY_MIN_VERSION = '0.13.3'
44
- NUMPY_MIN_VERSION = '1.8.1 '
44
+ NUMPY_MIN_VERSION = '1.8.2 '
45
45
46
46
47
47
# Optional setuptools features
You can’t perform that action at this time.
0 commit comments