Skip to content

Commit 284b11a

Browse files
committed
Merge branch 'master' into lars
2 parents 48f94f1 + 7a23b24 commit 284b11a

File tree

655 files changed

+37672
-19463
lines changed

Some content is hidden

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

655 files changed

+37672
-19463
lines changed

.codecov.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
comment: off

.gitattributes

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1 @@
1-
/sklearn/__check_build/_check_build.c -diff
2-
/sklearn/_isotonic.c -diff
3-
/sklearn/cluster/_dbscan_inner.cpp -diff
4-
/sklearn/cluster/_hierarchical.cpp -diff
5-
/sklearn/cluster/_k_means.c -diff
6-
/sklearn/datasets/_svmlight_format.c -diff
7-
/sklearn/decomposition/_online_lda.c -diff
8-
/sklearn/decomposition/cdnmf_fast.c -diff
9-
/sklearn/ensemble/_gradient_boosting.c -diff
10-
/sklearn/feature_extraction/_hashing.c -diff
11-
/sklearn/linear_model/cd_fast.c -diff
12-
/sklearn/linear_model/sgd_fast.c -diff
13-
/sklearn/linear_model/sag_fast.c -diff
14-
/sklearn/metrics/pairwise_fast.c -diff
15-
/sklearn/neighbors/ball_tree.c -diff
16-
/sklearn/neighbors/kd_tree.c -diff
17-
/sklearn/svm/liblinear.c -diff
18-
/sklearn/svm/libsvm.c -diff
19-
/sklearn/svm/libsvm_sparse.c -diff
20-
/sklearn/tree/_tree.c -diff
21-
/sklearn/tree/_utils.c -diff
22-
/sklearn/utils/arrayfuncs.c -diff
23-
/sklearn/utils/graph_shortest_path.c -diff
24-
/sklearn/utils/lgamma.c -diff
25-
/sklearn/utils/_logistic_sigmoid.c -diff
26-
/sklearn/utils/murmurhash.c -diff
27-
/sklearn/utils/seq_dataset.c -diff
28-
/sklearn/utils/sparsefuncs_fast.c -diff
29-
/sklearn/utils/weight_vector.c -diff
1+
/doc/whats_new.rst merge=union

.gitignore

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ scikit_learn.egg-info/
2323
.coverage
2424
coverage
2525
*.py,cover
26-
.tags
26+
.tags*
2727
tags
2828
covtype.data.gz
2929
20news-18828/
@@ -55,9 +55,13 @@ benchmarks/bench_covertype_data/
5555
.pydevproject
5656
.idea
5757

58-
cythonize.dat
5958
*.c
6059
*.cpp
6160

6261
!*/src/*.c
6362
!*/src/*.cpp
63+
*.sln
64+
*.pyproj
65+
66+
# Used by py.test
67+
.cache

.mailmap

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Alexandre Gramfort <alexandre.gramfort@inria.fr> <alexandre.gramfort@gmail.com>
22
Alexandre Gramfort <alexandre.gramfort@inria.fr> <alexandre.gramfort@m4x.org>
33
Alexandre Gramfort <alexandre.gramfort@inria.fr> <gramfort@localhost.(none)>
4+
Alexandre Saint <snt.alex@gmail.com>
45
Andreas Mueller <amueller@ais.uni-bonn.de>
56
Andreas Mueller <amueller@ais.uni-bonn.de> <Andreas Mueller@MSRC-3645211.europe.corp.microsoft.com>
67
Andreas Mueller <amueller@ais.uni-bonn.de> <amueller@ais.uni-bonn.de>
@@ -22,10 +23,10 @@ Brian Holt <bh00038@cvplws63.eps.surrey.ac.uk> <bdholt1@gmail.com>
2223
Christian Osendorfer <osendorf@gmail.com>
2324
Clay Woolam <clay@woolam.org>
2425
Danny Sullivan <dsullivan7@hotmail.com> <dbsullivan23@gmail.com>
25-
Denis Engemann <d.engemann@fz-juelich.de>
26-
Denis Engemann <d.engemann@fz-juelich.de> <denis.engemann@gmail.com>
27-
Denis Engemann <d.engemann@fz-juelich.de> <dengemann@Deniss-MacBook-Pro.local>
28-
Denis Engemann <d.engemann@fz-juelich.de> <dengemann <denis.engemann@gmail.com>
26+
Denis Engemann <denis-alexander.engemann@inria.fr>
27+
Denis Engemann <denis-alexander.engemann@inria.fr> <denis.engemann@gmail.com>
28+
Denis Engemann <denis-alexander.engemann@inria.fr> <dengemann@Deniss-MacBook-Pro.local>
29+
Denis Engemann <denis-alexander.engemann@inria.fr> <dengemann <denis.engemann@gmail.com>
2930
Diego Molla <dmollaaliod@gmail.com> <diego@diego-desktop.(none)>
3031
DraXus <draxus@gmail.com> draxus <draxus@hammer.ugr>
3132
Edouard DUCHESNAY <ed203246@is206877.intra.cea.fr> <duchesnay@is143433.(none)>
@@ -42,12 +43,16 @@ Federico Vaggi <vaggi.federico@gmail.com> <vaggi.federico@GMAIL.COM>
4243
Gael Varoquaux <gael.varoquaux@inria.fr>
4344
Gael Varoquaux <gael.varoquaux@inria.fr> <gael.varoquaux@normalesup.org>
4445
Gael Varoquaux <gael.varoquaux@inria.fr> <varoquau@normalesup.org>
46+
Giorgio Patrini <giorgio.patrini@nicta.com.au>
47+
Giorgio Patrini <giorgio.patrini@nicta.com.au> <giorgiop@users.noreply.github.com>
4548
Gilles Louppe <g.louppe@gmail.com> <g.louppe@ulg.ac.be>
4649
Hamzeh Alsalhi <93hamsal@gmail.com>
4750
Harikrishnan S <hihari777@gmail.com>
4851
Hendrik Heuer <hendrikheuer@gmail.com>
4952
Henry Lin <hlin117@gmail.com>
5053
Hrishikesh Huilgolkar <hrishikesh911@gmail.com> <hrishikesh@QE-IND-WKS007.(none)>
54+
Hugo Bowne-Anderson <hugobowne@gmail.com>
55+
Imaculate <imaculatemosha@yahoo.com>
5156
Immanuel Bayer <mane.desk@gmail.com>
5257
Jacob Schreiber <jmschreiber91@gmail.com>
5358
Jacob Schreiber <jmschreiber91@gmail.com> <jmschr@cs.washington.edu>
@@ -56,7 +61,7 @@ Jake VanderPlas <vanderplas@astro.washington.edu> <jakevdp@gmail.com>
5661
Jake VanderPlas <vanderplas@astro.washington.edu> <vanderplas@astro.washington.edu>
5762
James Bergstra <james.bergstra@gmail.com>
5863
Jaques Grobler <jaques.grobler@inria.fr> <jaquesgrobler@gmail.com>
59-
Jan Schl�ter <scikit-learn@jan-schlueter.de>
64+
Jan Schlüter <scikit-learn@jan-schlueter.de>
6065
Jean Kossaifi <jean.kossaifi@gmail.com>
6166
Jean Kossaifi <jean.kossaifi@gmail.com> <jkossaifi@is208616.intra.cea.fr>
6267
Jean Kossaifi <jean.kossaifi@gmail.com> <kossaifi@is208616.intra.cea.fr>
@@ -79,6 +84,7 @@ Sergio Medina <sergio.medina@inria.fr> <smedina@work4labs.com>
7984
Nelle Varoquaux <nelle.varoquaux@gmail.com>
8085
Nelle Varoquaux <nelle.varoquaux@gmail.com> <nelle@phgroup.com>
8186
Nelle Varoquaux <nelle.varoquaux@gmail.com> <nelle@varoquaux@gmail.com>
87+
Nicolas Goix <goix.nicolas@gmail.com>
8288
Nicolas Pinto <pinto@alum.mit.edu> <pinto@mit.edu>
8389
Noel Dawe <Noel.Dawe@cern.ch> <noel.dawe@gmail.com>
8490
Noel Dawe <Noel.Dawe@cern.ch> <noel.dAwe@cern.ch>
@@ -87,11 +93,15 @@ Olivier Grisel <olivier.grisel@ensta.org> <olivier.grisel@ensta.org>
8793
Olivier Hervieu <olivier.hervieu@gmail.com> <olivier.hervieu@tinyclues.com>
8894
Paul Butler <paulgb@gmail.com>
8995
Peter Prettenhofer <peter.prettenhofer@gmail.com>
96+
Raghav RV <rvraghav93@gmail.com>
97+
Raghav RV <rvraghav93@gmail.com> <ragvrv@gmail.com>
9098
Robert Layton <robertlayton@gmail.com>
9199
Roman Sinayev <roman.sinayev@gmail.com>
92100
Roman Sinayev <roman.sinayev@gmail.com> <roman@y570.(none)>
93101
Ronald Phlypo <Ronald.Phlypo@inria.fr>
94102
Satrajit Ghosh <satra@mit.edu> <satrajit.ghosh@gmail.com>
103+
Sebastian Raschka <se.raschka@me.com>
104+
Sebastian Raschka <mail@sebastianraschka.com> <se.raschka@me.com>
95105
Shiqiao Du <lucidfrontier.45@gmail.com>
96106
Shiqiao Du <lucidfrontier.45@gmail.com> <s.du@freebit.net>
97107
Thomas Unterthiner <thomas.unterthiner@gmx.net>

.travis.yml

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,16 @@ language: python
66
# Pre-install packages for the ubuntu distribution
77
cache:
88
apt: true
9-
# We use three different cache directory
10-
# to work around a Travis bug with multi-platform cache
119
directories:
12-
- $HOME/sklearn_build_ubuntu
13-
- $HOME/sklearn_build_oldest
14-
- $HOME/sklearn_build_latest
15-
- $HOME/sklearn_build_numpy_dev
1610
- $HOME/.cache/pip
17-
- $HOME/download
1811
addons:
1912
apt:
2013
packages:
14+
# these only required by the DISTRIB="ubuntu" builds:
15+
- python-scipy
2116
- libatlas3gf-base
2217
- libatlas-dev
23-
# only required by the DISTRIB="ubuntu" build:
24-
- python-scipy
25-
18+
dist: trusty
2619
env:
2720
global:
2821
# Directory where tests are run from
@@ -31,17 +24,28 @@ env:
3124
- OPENBLAS_NUM_THREADS=4
3225
matrix:
3326
# This environment tests that scikit-learn can be built against
34-
# 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
3528
- DISTRIB="ubuntu" PYTHON_VERSION="2.7" CYTHON_VERSION="0.23.4"
36-
CACHED_BUILD_DIR="$HOME/sklearn_build_ubuntu" COVERAGE=true
29+
COVERAGE=true
3730
# This environment tests the oldest supported anaconda env
38-
- DISTRIB="conda" PYTHON_VERSION="2.6" INSTALL_MKL="false"
39-
NUMPY_VERSION="1.6.2" SCIPY_VERSION="0.11.0" CYTHON_VERSION="0.21"
40-
CACHED_BUILD_DIR="$HOME/sklearn_build_oldest"
41-
# This environment tests the newest supported anaconda env
42-
- DISTRIB="conda" PYTHON_VERSION="3.5" INSTALL_MKL="false"
31+
- DISTRIB="conda" PYTHON_VERSION="2.7" INSTALL_MKL="false"
32+
NUMPY_VERSION="1.8.2" SCIPY_VERSION="0.13.3" CYTHON_VERSION="0.23.4"
33+
COVERAGE=true
34+
# This environment tests the newest supported Anaconda release (4.3.1)
35+
# It also runs tests requiring Pandas.
36+
- DISTRIB="conda" PYTHON_VERSION="3.6" INSTALL_MKL="true"
37+
NUMPY_VERSION="1.11.2" SCIPY_VERSION="0.18.1" PANDAS_VERSION="0.19.2"
38+
CYTHON_VERSION="0.25.2" COVERAGE=true
39+
# This environment use pytest to run the tests. It uses the newest
40+
# supported Anaconda release (4.3.1). It also runs tests requiring Pandas.
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.2"
43+
CYTHON_VERSION="0.25.2"
44+
# flake8 linting on diff wrt common ancestor with upstream/master
45+
- RUN_FLAKE8="true" SKIP_TESTS="true"
46+
DISTRIB="conda" PYTHON_VERSION="3.5" INSTALL_MKL="true"
4347
NUMPY_VERSION="1.10.4" SCIPY_VERSION="0.17.0" CYTHON_VERSION="0.23.4"
44-
CACHED_BUILD_DIR="$HOME/sklearn_build_latest"
48+
4549

4650
matrix:
4751
allow_failures:
@@ -53,16 +57,8 @@ matrix:
5357
# This environment tests scikit-learn against numpy and scipy master
5458
# installed from their CI wheels in a virtualenv with the Python
5559
# interpreter provided by travis.
56-
# Note: libatlas3gf-base is not allowed yet so we need 'sudo':
57-
# https://github.com/travis-ci/apt-package-whitelist/issues/2407
58-
# Once libatlas3gf-base is on the whitelist it will be possible to replace
59-
# the before_install step with and addons/apt/packages declaration.
6060
- python: 3.5
6161
env: DISTRIB="scipy-dev-wheels"
62-
CACHED_BUILD_DIR="$HOME/sklearn_build_numpy_dev"
63-
sudo: True
64-
before_install: sudo apt-get install -yqq libatlas3gf-base libatlas-dev
65-
6662

6763
install: source build_tools/travis/install.sh
6864
script: bash build_tools/travis/test_script.sh

AUTHORS.rst

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,34 +33,39 @@ The following people have been core contributors to scikit-learn's development a
3333
* Edouard Duchesnay
3434
* `Tom Dupré la Tour <https://github.com/TomDLT>`_
3535
* Alexander Fabisch
36-
* `Virgile Fritsch <http://parietal.saclay.inria.fr/Members/virgile-fritsch>`_
36+
* `Virgile Fritsch <https://team.inria.fr/parietal/vfritsch/>`_
3737
* `Satra Ghosh <http://www.mit.edu/~satra>`_
3838
* `Angel Soler Gollonet <http://webylimonada.com>`_
3939
* Chris Filo Gorgolewski
4040
* `Alexandre Gramfort <http://alexandre.gramfort.net>`_
41-
* `Olivier Grisel <http://twitter.com/ogrisel>`_
41+
* `Olivier Grisel <https://twitter.com/ogrisel>`_
4242
* `Jaques Grobler <https://github.com/jaquesgrobler>`_
4343
* `Yaroslav Halchenko <http://www.onerussian.com/>`_
44-
* `Brian Holt <http://info.ee.surrey.ac.uk/Personal/B.Holt/>`_
44+
* `Brian Holt <http://personal.ee.surrey.ac.uk/Personal/B.Holt/>`_
4545
* `Arnaud Joly <http://www.ajoly.org>`_
4646
* Thouis (Ray) Jones
4747
* `Kyle Kastner <http://kastnerkyle.github.io>`_
4848
* `Manoj Kumar <https://manojbits.wordpress.com>`_
4949
* Robert Layton
50-
* `Wei Li <http://kuantkid.github.com>`_
50+
* `Wei Li <http://kuantkid.github.io/>`_
5151
* Paolo Losi
52-
* `Gilles Louppe <http://www.montefiore.ulg.ac.be/~glouppe>`_
52+
* `Gilles Louppe <http://glouppe.github.io/>`_
5353
* `Jan Hendrik Metzen <https://github.com/jmetzen>`_
5454
* Vincent Michel
5555
* Jarrod Millman
5656
* `Andreas Müller <http://peekaboo-vision.blogspot.com>`_ (release manager)
5757
* `Vlad Niculae <http://vene.ro>`_
5858
* `Joel Nothman <http://joelnothman.com>`_
5959
* `Alexandre Passos <http://atpassos.posterous.com>`_
60-
* `Fabian Pedregosa <http://fseoane.net/blog/>`_
61-
* `Peter Prettenhofer <http://sites.google.com/site/peterprettenhofer/>`_
60+
* `Fabian Pedregosa <http://fa.bianp.net/blog/>`_
61+
* `Peter Prettenhofer <https://sites.google.com/site/peterprettenhofer/>`_
6262
* Bertrand Thirion
63-
* `Jake VanderPlas <http://www.astro.washington.edu/users/vanderplas/>`_
63+
* `Jake VanderPlas <http://staff.washington.edu/jakevdp/>`_
6464
* Nelle Varoquaux
65-
* `Gael Varoquaux <http://gael-varoquaux.info/blog/>`_
65+
* `Gael Varoquaux <http://gael-varoquaux.info/>`_
6666
* Ron Weiss
67+
68+
Please do not email the authors directly to ask for assistance or report issues.
69+
Instead, please see `What's the best way to ask questions about scikit-learn
70+
<http://scikit-learn.org/stable/faq.html#what-s-the-best-way-to-get-help-on-scikit-learn-usage>`_
71+
in the FAQ.

0 commit comments

Comments
 (0)