Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 9a44eb3

Browse files
committed
Merge commit '0.14a1-239-g0872592' into dfsg
* commit '0.14a1-239-g0872592': (2048 commits) DOC copyedit SGDClassifier docstring DOC: also point installation menu to stable DOC home always points to stable DOC now building to html/stable comments added to the changes DOC: few small doc fixes to layout bugs on new website FIX: remove dupplicate entry in What's new DOC: DBSCAN misc doc formatting MISC: fix reference to example MISC: update whats_new DOC credit to @ephes and myself for log loss in metrics DBSCAN BallTree implementation DOC added link from banner to example. DOC Update what's new DOC fix comment on svm probability param Also clean the dist folder when calling make Ignore the generated MANIFEST file partial_fit for naive Bayes was done for 0.14-rc, not 0.11... Re-align the what's new file with the new ordering of items from master Fixed a typo in a contributor's name ... Conflicts: joblib has its own destiny sklearn/externals/joblib/__init__.py sklearn/externals/joblib/format_stack.py sklearn/externals/joblib/func_inspect.py sklearn/externals/joblib/hashing.py sklearn/externals/joblib/logger.py sklearn/externals/joblib/memory.py sklearn/externals/joblib/numpy_pickle.py sklearn/externals/joblib/parallel.py sklearn/externals/joblib/test/test_memory.py sklearn/externals/joblib/test/test_parallel.py
2 parents 9ad265e + 0872592 commit 9a44eb3

File tree

635 files changed

+262269
-61788
lines changed

Some content is hidden

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

635 files changed

+262269
-61788
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/sklearn/__check_build/_check_build.c -diff
22
/sklearn/_hmmc.c -diff
3+
/sklearn/_isotonic.c -diff
34
/sklearn/cluster/_hierarchical.c -diff
45
/sklearn/cluster/_k_means.c -diff
56
/sklearn/datasets/_svmlight_format.c -diff
@@ -17,6 +18,7 @@
1718
/sklearn/utils/arrayfuncs.c -diff
1819
/sklearn/utils/graph_shortest_path.c -diff
1920
/sklearn/utils/lgamma.c -diff
21+
/sklearn/utils/_logistic_sigmoid.c -diff
2022
/sklearn/utils/murmurhash.c -diff
2123
/sklearn/utils/seq_dataset.c -diff
2224
/sklearn/utils/sparsefuncs.c -diff

.gitignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
*.pyc
22
*.so
3+
*.pyd
34
*~
45
.#*
6+
*.lprof
57
*.swp
68
*.swo
79
.DS_Store
@@ -10,10 +12,12 @@ sklearn/datasets/__config__.py
1012
sklearn/**/*.html
1113

1214
dist/
15+
MANIFEST
1316
doc/_build/
1417
doc/auto_examples/
1518
doc/modules/generated/
1619
doc/datasets/generated/
20+
*.pdf
1721
pip-log.txt
1822
scikit_learn.egg-info/
1923
.coverage
@@ -30,6 +34,7 @@ coverages
3034
samples
3135
doc/coverages
3236
doc/samples
37+
*.prof
3338

3439
lfw_preprocessed/
3540
nips2010_pdf/
@@ -39,4 +44,9 @@ nips2010_pdf/
3944
*.tgz
4045

4146
examples/cluster/joblib
47+
reuters/
4248
benchmarks/bench_covertype_data/
49+
50+
*.prefs
51+
.pydevproject
52+
.idea

.mailmap

Lines changed: 76 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,80 @@
1-
Gael Varoquaux <[email protected]> gvaroquaux <[email protected]>
2-
Gael Varoquaux <[email protected]> Gael varoquaux <[email protected]>
3-
Gael Varoquaux <[email protected]> GaelVaroquaux <[email protected]>
4-
Gael Varoquaux <[email protected]> Varoquaux <[email protected]>
5-
Olivier Grisel <[email protected]> ogrisel <[email protected]>
6-
Olivier Grisel <[email protected]> Olivier Grisel <ogrisel@turingcarpet.(none)>
7-
Alexandre Gramfort <[email protected]> Alexandre Gramfort <[email protected]>
8-
Alexandre Gramfort <[email protected]> Alexandre Gramfort <[email protected]>
9-
Alexandre Gramfort <[email protected]> Alexandre Gramfort <gramfort@localhost.(none)>
10-
Matthieu Perrot <[email protected]> Matthieu Perrot <revilyo@earth.(none)>
11-
Matthieu Perrot <[email protected]> revilyo <revilyo@earth.(none)>
12-
Vincent Michel <[email protected]> vincent <[email protected]>
13-
Vincent Michel <[email protected]> vincent <vincent@axon.(none)>
14-
Vincent Michel <[email protected]> vincent M <[email protected]>
15-
Vincent Michel <[email protected]> Vincent M <[email protected]>
16-
Vincent Michel <[email protected]> Vincent Michel <[email protected]>
17-
Vincent Michel <[email protected]> Vincent M <[email protected]>
18-
Vincent Michel <[email protected]> Vincent michel <[email protected]>
19-
Vincent Michel <[email protected]> Vincent Michel <[email protected]>
1+
Alexandre Gramfort <[email protected]> <[email protected]>
2+
Alexandre Gramfort <[email protected]> <[email protected]>
3+
Alexandre Gramfort <[email protected]> <gramfort@localhost.(none)>
4+
Andreas Mueller <[email protected]>
5+
Andreas Mueller <[email protected]> <Andreas [email protected]>
6+
7+
8+
Andreas Mueller <[email protected]> <andy@marvin>
9+
Arnaud Joly <[email protected]>
10+
11+
12+
Anne-Laure Fouque <afouque@is208050.(none)> <[email protected]>
2013
Ariel Rokem <[email protected]> arokem <[email protected]>
21-
Bertrand Thirion <[email protected]> bthirion <[email protected]>
22-
Peter Prettenhofer <[email protected]> pprett <[email protected]>
23-
Anne-Laure Fouque <afouque@is208050.(none)> Anne-Laure FOUQUE <[email protected]>
24-
Vincent Dubourg <[email protected]> dubourg <[email protected]>
25-
Vincent Dubourg <[email protected]> dubourg <dubourg@PTlami14.(none)>
26-
Christian Osendorfer <[email protected]> osdf <[email protected]>
27-
James Bergstra <[email protected]> james.bergstra <[email protected]>
28-
29-
30-
31-
Virgile Fritsch <[email protected]> VirgileFritsch <[email protected]>
32-
Virgile Fritsch <[email protected]> Virgile <[email protected]>
33-
Virgile Fritsch <[email protected]> Virgile <virgile@virgile-Precision-M4400.(none)>
34-
Jean Kossaifi <[email protected]> Jean KOSSAIFI <[email protected]>
35-
Jean Kossaifi <[email protected]> JeanKossaifi <[email protected]>
36-
Jean Kossaifi <[email protected]> Jean Kossaifi <[email protected]>
37-
Jake VanderPlas <[email protected]> Jacob Vanderplas <[email protected]>
38-
Jake VanderPlas <[email protected]> Jake Vanderplas <[email protected]>
39-
Jake VanderPlas <[email protected]> Jake Vanderplas <[email protected]>
40-
Andreas Mueller <[email protected]> Andy <[email protected]>
41-
Andreas Mueller <[email protected]> unknown <Andreas [email protected]>
42-
Andreas Mueller <[email protected]> andy <andy@marvin>
43-
Andreas Mueller <[email protected]> Andreas Mueller <[email protected]>
44-
Andreas Mueller <[email protected]> Andreas Müller <[email protected]>
45-
Brian Holt <[email protected]> bdholt1 <[email protected]>
46-
Brian Holt <[email protected]> Brian Holt <[email protected]>
47-
Robert Layton <[email protected]> robertlayton <[email protected]>
48-
49-
Fabian Pedregosa <[email protected]> Fabian Pedregosa <[email protected]>
50-
Lars Buitinck <[email protected]> Lars Buitinck <[email protected]>
51-
Lars Buitinck <[email protected]> unknown <Lars@.(none)>
52-
Lars Buitinck <[email protected]> Lars Buitinck <[email protected]>
53-
54-
Edouard DUCHESNAY <[email protected]> Edouard Duchesnay <duchesnay@is143433.(none)>
55-
Edouard DUCHESNAY <[email protected]> Edouard Duchesnay <[email protected]>
56-
Edouard DUCHESNAY <[email protected]> duchesnay <[email protected]>
57-
Edouard DUCHESNAY <[email protected]> duchesnay <edouard@is2206219.(none)>
58-
Emmanuelle Gouillart <[email protected]> Emmanuelle Gouillart <emma@aleph.(none)>
59-
Emmanuelle Gouillart <[email protected]> emmanuelle <[email protected]>
60-
Gilles Louppe <[email protected]> Gilles Louppe <[email protected]>
61-
Nelle Varoquaux <[email protected]> Nelle Varoquaux <[email protected]>
62-
Nicolas Pinto <[email protected]> Nicolas Pinto <[email protected]>
63-
Olivier Hervieu <[email protected]> Olivier Hervieu <[email protected]>
64-
Satrajit Ghosh <[email protected]> Satrajit Ghosh <[email protected]>
65-
Shiqiao Du <[email protected]> Shiqiao Du <[email protected]>
66-
Shiqiao Du <[email protected]> Shiqiao <[email protected]>
67-
Tim Sheerman-Chase <[email protected]> Tim Sheerman-Chase <ts00051@ts00051-desktop.(none)>
68-
Vincent Schut <[email protected]> Vincent Schut <vincent@TIMO.(none)>
69-
70-
71-
72-
Hrishikesh Huilgolkar <[email protected]> <hrishikesh@QE-IND-WKS007.(none)>
14+
Bertrand Thirion <[email protected]>
7315
74-
Brian Cheung <[email protected]> cow <briancheung>
75-
Brian Cheung <[email protected]> cow <cow@rusty.(none)>
16+
Brian Cheung <[email protected]> <briancheung>
17+
Brian Cheung <[email protected]> <cow@rusty.(none)>
18+
19+
Christian Osendorfer <[email protected]>
20+
Clay Woolam <[email protected]>
7621
Diego Molla <[email protected]> <diego@diego-desktop.(none)>
77-
Michael EICKENBERG <[email protected]> Michael EICKENBERG <[email protected]>
78-
Michael EICKENBERG <[email protected]> Michael <[email protected]>
79-
22+
23+
Edouard DUCHESNAY <[email protected]> <duchesnay@is143433.(none)>
24+
25+
Edouard DUCHESNAY <[email protected]> <edouard@is2206219.(none)>
26+
Emmanuelle Gouillart <[email protected]>
27+
Emmanuelle Gouillart <[email protected]> <emma@aleph.(none)>
28+
29+
Federico Vaggi <[email protected]>
30+
Gael Varoquaux <[email protected]>
31+
32+
33+
Harikrishnan S <[email protected]>
34+
Hrishikesh Huilgolkar <[email protected]> <hrishikesh@QE-IND-WKS007.(none)>
35+
Immanuel Bayer <[email protected]>
36+
37+
38+
39+
James Bergstra <[email protected]>
40+
Jan Schl�ter <[email protected]>
41+
Jean Kossaifi <[email protected]>
42+
43+
44+
45+
Lars Buitinck <[email protected]> <Lars@.(none)>
46+
47+
48+
Matthieu Perrot <[email protected]> <revilyo@earth.(none)>
49+
Michael Eickenberg <[email protected]>
50+
Michael Eickenberg <[email protected]> <[email protected]>
51+
Nelle Varoquaux <[email protected]>
52+
53+
8054
81-
82-
X006 <x006@x006-icsl.(none)> x006 <x006@x006laptop.(none)>
55+
Olivier Grisel <[email protected]> <ogrisel@turingcarpet.(none)>
56+
57+
58+
Peter Prettenhofer <[email protected]>
59+
Robert Layton <[email protected]>
60+
Roman Sinayev <[email protected]>
61+
Roman Sinayev <[email protected]> <roman@y570.(none)>
62+
63+
Shiqiao Du <[email protected]>
64+
65+
Tim Sheerman-Chase <[email protected]> <ts00051@ts00051-desktop.(none)>
66+
Vincent Dubourg <[email protected]>
67+
Vincent Dubourg <[email protected]> <dubourg@PTlami14.(none)>
68+
69+
Vincent Michel <[email protected]> <vincent@axon.(none)>
70+
71+
72+
73+
Vincent Schut <[email protected]> <vincent@TIMO.(none)>
74+
Virgile Fritsch <[email protected]>
75+
Virgile Fritsch <[email protected]> <virgile@virgile-Precision-M4400.(none)>
76+
Vlad Niculae <[email protected]>
77+
78+
79+
X006 <x006@x006-icsl.(none)> <x006@x006laptop.(none)>
80+

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
language: python
22
python:
33
- "2.7"
4-
virtualenv:
4+
virtualenv:
55
system_site_packages: true
66
before_install:
77
- sudo apt-get update -qq
8-
- sudo apt-get install -qq python-scipy
8+
- sudo apt-get install -qq python-scipy python-nose
99
install: python setup.py build_ext --inplace
1010
script: make test

AUTHORS.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,5 @@ People
8787
* `Wei Li <http://kuantkid.github.com>`_
8888

8989
* `Arnaud Joly <http://www.ajoly.org>`_
90+
91+
* `Kemal Eren <http://www.kemaleren.com>`_

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
include *.rst
22
recursive-include doc *
33
recursive-include examples *
4-
recursive-include sklearn *.c *.h *.pyx
4+
recursive-include sklearn *.c *.h *.pyx *.pxd
55
recursive-include sklearn/datasets *.csv *.csv.gz *.rst *.jpg *.txt

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ clean-pyc:
1515
clean-so:
1616
find sklearn -name "*.so" | xargs rm -f
1717
find sklearn -name "*.pyd" | xargs rm -f
18+
find sklearn -name "__pycache__" | xargs rm -rf
1819

1920
clean-build:
2021
rm -rf build
22+
rm -rf dist
2123

2224
clean-ctags:
2325
rm -f tags

README-py3k.rst

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

README.rst

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,12 @@ Important links
3434
Dependencies
3535
============
3636

37-
The required dependencies to build the software are Python >= 2.6,
38-
setuptools, Numpy >= 1.3, SciPy >= 0.7 and a working C/C++ compiler.
37+
scikit-learn is tested to work under Python 2.6+ and Python 3.3+
38+
(using the same codebase thanks to an embedded copy of [six](
39+
http://pythonhosted.org/six/)).
40+
41+
The required dependencies to build the software Numpy >= 1.3, SciPy >= 0.7
42+
and a working C/C++ compiler.
3943

4044
For running the examples Matplotlib >= 0.99.1 is required and for running the
4145
tests you need nose >= 0.10.
@@ -49,7 +53,7 @@ Install
4953
This package uses distutils, which is the default way of installing
5054
python modules. To install in your home directory, use::
5155

52-
python setup.py install --home
56+
python setup.py install --user
5357

5458
To install for all users on Unix/Linux::
5559

0 commit comments

Comments
 (0)