Skip to content

Commit 9d0cd00

Browse files
thomasjpfanthomasjpfan
committed
Merge remote-tracking branch 'upstream/master' into inverse_col_trans
2 parents 360d09b + 7166cd5 commit 9d0cd00

360 files changed

Lines changed: 17920 additions & 4325 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.circleci/config.yml‎

Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,12 @@ jobs:
4141
# Test examples run with minimal dependencies
4242
- MINICONDA_PATH: ~/miniconda
4343
- CONDA_ENV_NAME: testenv
44-
- PYTHON_VERSION: 2
45-
- NUMPY_VERSION: 1.8.2
46-
# XXX: plot_gpc_xor.py fails with scipy 0.13.3
47-
- SCIPY_VERSION: 0.14
48-
- MATPLOTLIB_VERSION: 1.3
49-
- SCIKIT_IMAGE_VERSION: 0.9.3
50-
- PANDAS_VERSION: 0.13.1
44+
- PYTHON_VERSION: "2"
45+
- NUMPY_VERSION: "1.10"
46+
- SCIPY_VERSION: "0.16"
47+
- MATPLOTLIB_VERSION: "1.4"
48+
- SCIKIT_IMAGE_VERSION: "0.11"
49+
- PANDAS_VERSION: "0.17.1"
5150
steps:
5251
- checkout
5352
- run: ./build_tools/circle/checkout_merge_commit.sh
@@ -65,6 +64,21 @@ jobs:
6564
path: ~/log.txt
6665
destination: log.txt
6766

67+
pypy3:
68+
docker:
69+
- image: pypy:3-6.0.0
70+
steps:
71+
- restore_cache:
72+
keys:
73+
- pypy3-ccache-{{ .Branch }}
74+
- pypy3-ccache
75+
- checkout
76+
- run: ./build_tools/circle/build_test_pypy.sh
77+
- save_cache:
78+
key: pypy3-ccache-{{ .Branch }}-{{ .BuildNum }}
79+
paths:
80+
- ~/.ccache
81+
- ~/.cache/pip
6882

6983
deploy:
7084
docker:
@@ -89,6 +103,21 @@ workflows:
89103
jobs:
90104
- python3
91105
- python2
106+
- pypy3:
107+
filters:
108+
branches:
109+
only:
110+
- 0.20.X
92111
- deploy:
93112
requires:
94113
- python3
114+
pypy:
115+
triggers:
116+
- schedule:
117+
cron: "0 0 * * *"
118+
filters:
119+
branches:
120+
only:
121+
- master
122+
jobs:
123+
- pypy3

‎.travis.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ matrix:
3838
NUMPY_VERSION="1.10.4" SCIPY_VERSION="0.16.1" CYTHON_VERSION="0.25.2"
3939
PILLOW_VERSION="4.0.0" COVERAGE=true
4040
if: type != cron
41-
# This environment tests the newest supported Anaconda release.
41+
# This environment tests the latest available dependencies.
4242
# It runs tests requiring pandas and PyAMG.
4343
# It also runs with the site joblib instead of the vendored copy of joblib.
44-
- env: DISTRIB="conda" PYTHON_VERSION="3.6.2" INSTALL_MKL="true"
45-
NUMPY_VERSION="1.14.2" SCIPY_VERSION="1.0.0" PANDAS_VERSION="0.20.3"
46-
CYTHON_VERSION="0.26.1" PYAMG_VERSION="3.3.2" PILLOW_VERSION="4.3.0"
47-
JOBLIB_VERSION="0.12" COVERAGE=true
44+
- env: DISTRIB="conda" PYTHON_VERSION="*" INSTALL_MKL="true"
45+
NUMPY_VERSION="*" SCIPY_VERSION="*" PANDAS_VERSION="*"
46+
CYTHON_VERSION="*" PYAMG_VERSION="*" PILLOW_VERSION="*"
47+
JOBLIB_VERSION="*" COVERAGE=true
4848
CHECK_PYTEST_SOFT_DEPENDENCY="true" TEST_DOCSTRINGS="true"
49-
SKLEARN_SITE_JOBLIB=1
49+
SKLEARN_SITE_JOBLIB=1 CHECK_WARNINGS="true"
5050
if: type != cron
5151
# flake8 linting on diff wrt common ancestor with upstream/master
5252
- env: RUN_FLAKE8="true" SKIP_TESTS="true"
@@ -58,7 +58,7 @@ matrix:
5858
# installed from their CI wheels in a virtualenv with the Python
5959
# interpreter provided by travis.
6060
- python: 3.6
61-
env: DISTRIB="scipy-dev"
61+
env: DISTRIB="scipy-dev" CHECK_WARNINGS="true"
6262
if: type = cron OR commit_message =~ /\[scipy-dev\]/
6363

6464
install: source build_tools/travis/install.sh

‎AUTHORS.rst‎

Lines changed: 0 additions & 75 deletions
This file was deleted.

‎CONTRIBUTING.md‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -178,13 +178,21 @@ following rules before submitting:
178178
as your Python, scikit-learn, numpy, and scipy versions. This information
179179
can be found by running the following code snippet:
180180

181-
```python
182-
import platform; print(platform.platform())
183-
import sys; print("Python", sys.version)
184-
import numpy; print("NumPy", numpy.__version__)
185-
import scipy; print("SciPy", scipy.__version__)
186-
import sklearn; print("Scikit-Learn", sklearn.__version__)
187-
```
181+
For scikit-learn >= 0.20:
182+
183+
```python
184+
import sklearn; sklearn.show_versions()
185+
```
186+
187+
For scikit-learn < 0.20:
188+
189+
```python
190+
import platform; print(platform.platform())
191+
import sys; print("Python", sys.version)
192+
import numpy; print("NumPy", numpy.__version__)
193+
import scipy; print("SciPy", scipy.__version__)
194+
import sklearn; print("Scikit-Learn", sklearn.__version__)
195+
```
188196

189197
- Please be specific about what estimators and/or functions are involved
190198
and the shape of the data, as appropriate; please include a

‎ISSUE_TEMPLATE.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ it in the issue: https://gist.github.com
4343
#### Versions
4444
<!--
4545
Please run the following snippet and paste the output below.
46+
For scikit-learn >= 0.20:
47+
import sklearn; sklearn.show_versions()
48+
For scikit-learn < 0.20:
4649
import platform; print(platform.platform())
4750
import sys; print("Python", sys.version)
4851
import numpy; print("NumPy", numpy.__version__)

‎MANIFEST.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include *.rst
22
recursive-include doc *
33
recursive-include examples *
44
recursive-include sklearn *.c *.h *.pyx *.pxd *.pxi
5-
recursive-include sklearn/datasets *.csv *.csv.gz *.rst *.jpg *.txt
5+
recursive-include sklearn/datasets *.csv *.csv.gz *.rst *.jpg *.txt *.arff.gz *.json.gz
66
include COPYING
77
include AUTHORS.rst
88
include README.rst

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ inplace:
2424
$(PYTHON) setup.py build_ext -i
2525

2626
test-code: in
27-
$(PYTEST) --showlocals -v sklearn
27+
$(PYTEST) --showlocals -v sklearn --durations=20
2828
test-sphinxext:
2929
$(PYTEST) --showlocals -v doc/sphinxext/
3030
test-doc:

‎README.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ scikit-learn requires:
5656
**Scikit-learn 0.20 is the last version to support Python2.7.**
5757
Scikit-learn 0.21 and later will require Python 3.5 or newer.
5858

59-
For running the examples Matplotlib >= 1.3.1 is required. A few examples
60-
require scikit-image >= 0.9.3 and a few examples require pandas >= 0.13.1.
59+
For running the examples Matplotlib >= 1.4 is required. A few examples
60+
require scikit-image >= 0.11.3 and a few examples require pandas >= 0.17.1.
6161

6262
scikit-learn also uses CBLAS, the C interface to the Basic Linear Algebra
6363
Subprograms library. scikit-learn comes with a reference implementation, but
@@ -120,7 +120,7 @@ Testing
120120
~~~~~~~
121121

122122
After installation, you can launch the test suite from outside the
123-
source directory (you will need to have the ``pytest`` package installed)::
123+
source directory (you will need to have ``pytest`` >= 3.3.0 installed)::
124124

125125
pytest sklearn
126126

‎appveyor.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ environment:
2020
- PYTHON: "C:\\Python37-x64"
2121
PYTHON_VERSION: "3.7.0"
2222
PYTHON_ARCH: "64"
23+
CHECK_WARNINGS: "true"
2324

2425
- PYTHON: "C:\\Python27"
2526
PYTHON_VERSION: "2.7.8"
@@ -72,7 +73,13 @@ test_script:
7273
# installed library.
7374
- mkdir "../empty_folder"
7475
- cd "../empty_folder"
75-
- pytest --showlocals --durations=20 --pyargs sklearn
76+
- ps: >-
77+
if (Test-Path variable:global:CHECK_WARNINGS) {
78+
$env:PYTEST_ARGS = "-Werror::DeprecationWarning -Werror::FutureWarning"
79+
} else {
80+
$env:PYTEST_ARGS = ""
81+
}
82+
- "pytest --showlocals --durations=20 %PYTEST_ARGS% --pyargs sklearn"
7683
# Move back to the project folder
7784
- cd "../scikit-learn"
7885

‎build_tools/Makefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Makefile for maintenance tools
2+
3+
authors:
4+
python generate_authors_table.py > ../doc/authors.rst

0 commit comments

Comments
 (0)