Skip to content

Commit 0885d22

Browse files
lestevejnothman
authored andcommitted
MAINT use Python 3.4 in first conda build (scikit-learn#10193)
1 parent 6f077a6 commit 0885d22

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ matrix:
2222
include:
2323
# This environment tests that scikit-learn can be built against
2424
# versions of numpy, scipy with ATLAS that comes with Ubuntu Trusty 14.04
25+
# i.e. numpy 1.8.2 and scipy 0.13.3
2526
- env: DISTRIB="ubuntu" PYTHON_VERSION="2.7" CYTHON_VERSION="0.23.5"
2627
COVERAGE=true
2728
if: type != cron
@@ -32,9 +33,9 @@ matrix:
3233
- python-scipy
3334
- libatlas3-base
3435
- libatlas-dev
35-
# This environment tests the oldest supported anaconda env
36-
- env: DISTRIB="conda" PYTHON_VERSION="2.7" INSTALL_MKL="false"
37-
NUMPY_VERSION="1.8.2" SCIPY_VERSION="0.13.3" CYTHON_VERSION="0.23.5"
36+
# Python 3.4 build
37+
- env: DISTRIB="conda" PYTHON_VERSION="3.4" INSTALL_MKL="false"
38+
NUMPY_VERSION="1.10.4" SCIPY_VERSION="0.16.1" CYTHON_VERSION="0.25.2"
3839
COVERAGE=true
3940
if: type != cron
4041
# This environment tests the newest supported Anaconda release (5.0.0)

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Dependencies
4949

5050
scikit-learn requires:
5151

52-
- Python (>= 2.7 or >= 3.3)
52+
- Python (>= 2.7 or >= 3.4)
5353
- NumPy (>= 1.8.2)
5454
- SciPy (>= 0.13.3)
5555

doc/developers/advanced_installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Installing an official release
3535

3636
Scikit-learn requires:
3737

38-
- Python (>= 2.7 or >= 3.3),
38+
- Python (>= 2.7 or >= 3.4),
3939
- NumPy (>= 1.8.2),
4040
- SciPy (>= 0.13.3).
4141

doc/install.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Installing the latest release
1515

1616
Scikit-learn requires:
1717

18-
- Python (>= 2.7 or >= 3.3),
18+
- Python (>= 2.7 or >= 3.4),
1919
- NumPy (>= 1.8.2),
2020
- SciPy (>= 0.13.3).
2121

doc/whats_new/v0.20.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ cannot assure that this list is complete.)
3333
Changelog
3434
---------
3535

36+
Support for Python 3.3 has been officially dropped.
37+
3638
New features
3739
............
3840

0 commit comments

Comments
 (0)