Skip to content

Commit de147a4

Browse files
glemaitreglemaitre
committed
Merge remote-tracking branch 'origin/master' into nan_robust_scaler
2 parents b6f1df6 + e555893 commit de147a4

File tree

97 files changed

+3181
-1772
lines changed

Some content is hidden

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

97 files changed

+3181
-1772
lines changed

‎README.rst‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,12 @@ or ``conda``::
7878
The documentation includes more detailed `installation instructions <http://scikit-learn.org/stable/install.html>`_.
7979

8080

81+
Changelog
82+
---------
83+
84+
See the `changelog <http://scikit-learn.org/dev/whats_new.html>`__
85+
for a history of notable changes to scikit-learn.
86+
8187
Development
8288
-----------
8389

‎build_tools/circle/list_versions.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ def get_pdf_size(version):
4747
return human_readable_data_quantity(path_details['size'], 1000)
4848

4949

50+
print(':orphan:')
51+
print()
5052
heading = 'Available documentation for Scikit-learn'
5153
print(heading)
5254
print('=' * len(heading))

‎doc/conf.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,6 @@
7070
# The encoding of source files.
7171
#source_encoding = 'utf-8'
7272

73-
# Generate the plots for the gallery
74-
plot_gallery = True
75-
7673
# The master toctree document.
7774
master_doc = 'index'
7875

@@ -102,7 +99,7 @@
10299

103100
# List of patterns, relative to source directory, that match files and
104101
# directories to ignore when looking for source files.
105-
exclude_patterns = ['_build', 'templates', 'includes']
102+
exclude_patterns = ['_build', 'templates', 'includes', 'themes']
106103

107104
# The reST default role (used for this markup: `text`) to use for all
108105
# documents.

‎doc/conftest.py‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,20 +68,31 @@ def setup_compose():
6868
raise SkipTest("Skipping compose.rst, pandas not installed")
6969

7070

71+
def setup_impute():
72+
try:
73+
import pandas # noqa
74+
except ImportError:
75+
raise SkipTest("Skipping impute.rst, pandas not installed")
76+
77+
7178
def pytest_runtest_setup(item):
7279
fname = item.fspath.strpath
73-
if fname.endswith('datasets/labeled_faces.rst'):
80+
is_index = fname.endswith('datasets/index.rst')
81+
if fname.endswith('datasets/labeled_faces.rst') or is_index:
7482
setup_labeled_faces()
75-
elif fname.endswith('datasets/mldata.rst'):
83+
elif fname.endswith('datasets/mldata.rst') or is_index:
7684
setup_mldata()
77-
elif fname.endswith('datasets/rcv1.rst'):
85+
elif fname.endswith('datasets/rcv1.rst') or is_index:
7886
setup_rcv1()
79-
elif fname.endswith('datasets/twenty_newsgroups.rst'):
87+
elif fname.endswith('datasets/twenty_newsgroups.rst') or is_index:
8088
setup_twenty_newsgroups()
81-
elif fname.endswith('tutorial/text_analytics/working_with_text_data.rst'):
89+
elif fname.endswith('tutorial/text_analytics/working_with_text_data.rst')\
90+
or is_index:
8291
setup_working_with_text_data()
83-
elif fname.endswith('modules/compose.rst'):
92+
elif fname.endswith('modules/compose.rst') or is_index:
8493
setup_compose()
94+
elif fname.endswith('modules/impute.rst'):
95+
setup_impute()
8596

8697

8798
def pytest_runtest_teardown(item):

‎doc/datasets/covtype.rst‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
21
.. _covtype:
32

43
Forest covertypes
5-
=================
4+
-----------------
65

76
The samples in this dataset correspond to 30×30m patches of forest in the US,
87
collected for the task of predicting each patch's cover type,
98
i.e. the dominant species of tree.
109
There are seven covertypes, making this a multiclass classification problem.
1110
Each sample has 54 features, described on the
12-
`dataset's homepage <http://archive.ics.uci.edu/ml/datasets/Covertype>`_.
11+
`dataset's homepage <http://archive.ics.uci.edu/ml/datasets/Covertype>`__.
1312
Some of the features are boolean indicators,
1413
while others are discrete or continuous measurements.
1514

0 commit comments

Comments
 (0)