Skip to content

Commit c4d6722

Browse files
committed
Fixes for travis on latest deps
1 parent f9687ca commit c4d6722

File tree

4 files changed

+7
-2
lines changed

4 files changed

+7
-2
lines changed

sklearn/datasets/svmlight_format.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def load_svmlight_file(f, n_features=None, dtype=np.float64,
134134
135135
See also
136136
--------
137-
load_svmlight_files: similar function for loading multiple files in this
137+
load_svmlight_files : similar function for loading multiple files in this
138138
format, enforcing the same number of features/columns on all of them.
139139
140140
Examples

sklearn/metrics/pairwise.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ def cosine_distances(X, Y=None):
544544
See also
545545
--------
546546
sklearn.metrics.pairwise.cosine_similarity
547-
scipy.spatial.distance.cosine (dense matrices only)
547+
scipy.spatial.distance.cosine : dense matrices only
548548
"""
549549
# 1.0 - cosine_similarity(X, Y) without copy
550550
S = cosine_similarity(X, Y)

sklearn/tests/test_multioutput.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,8 @@ def test_multi_target_sample_weights():
166166
classes = list(map(np.unique, (y1, y2, y3)))
167167

168168

169+
# 0.23. warning about tol not having its correct default value.
170+
@pytest.mark.filterwarnings('ignore:max_iter and tol parameters have been')
169171
def test_multi_output_classification_partial_fit_parallelism():
170172
sgd_linear_clf = SGDClassifier(loss='log', random_state=1, max_iter=5)
171173
mor = MultiOutputClassifier(sgd_linear_clf, n_jobs=-1)

sklearn/utils/tests/test_show_versions.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from sklearn.utils._show_versions import _get_sys_info
33
from sklearn.utils._show_versions import _get_deps_info
44
from sklearn.utils._show_versions import show_versions
5+
from sklearn.utils.testing import ignore_warnings
56

67

78
def test_get_sys_info():
@@ -12,6 +13,7 @@ def test_get_sys_info():
1213
assert 'machine' in sys_info
1314

1415

16+
@ignore_warnings
1517
def test_get_deps_info():
1618
deps_info = _get_deps_info()
1719

@@ -24,6 +26,7 @@ def test_get_deps_info():
2426
assert 'pandas' in deps_info
2527

2628

29+
@ignore_warnings
2730
def test_show_versions_with_blas(capsys):
2831
show_versions()
2932
out, err = capsys.readouterr()

0 commit comments

Comments
 (0)