diff --git a/sklearn/cluster/tests/test_affinity_propagation.py b/sklearn/cluster/tests/test_affinity_propagation.py index a814a5167bb0a..eac9f33d352e4 100644 --- a/sklearn/cluster/tests/test_affinity_propagation.py +++ b/sklearn/cluster/tests/test_affinity_propagation.py @@ -7,7 +7,7 @@ from sklearn.exceptions import ConvergenceWarning from sklearn.utils.testing import ( - assert_equal, assert_false, assert_true, assert_array_equal, assert_raises, + assert_equal, assert_false, assert_array_equal, assert_raises, assert_warns, assert_warns_message, assert_no_warnings) from sklearn.cluster.affinity_propagation_ import AffinityPropagation diff --git a/sklearn/cluster/tests/test_bicluster.py b/sklearn/cluster/tests/test_bicluster.py index ab65b46e28332..dd5e91c18c27e 100644 --- a/sklearn/cluster/tests/test_bicluster.py +++ b/sklearn/cluster/tests/test_bicluster.py @@ -10,7 +10,6 @@ from sklearn.utils.testing import assert_array_equal from sklearn.utils.testing import assert_array_almost_equal from sklearn.utils.testing import assert_raises -from sklearn.utils.testing import assert_true from sklearn.utils.testing import SkipTest from sklearn.base import BaseEstimator, BiclusterMixin diff --git a/sklearn/cluster/tests/test_feature_agglomeration.py b/sklearn/cluster/tests/test_feature_agglomeration.py index cb61413efc22f..b6fe72da9fdcc 100644 --- a/sklearn/cluster/tests/test_feature_agglomeration.py +++ b/sklearn/cluster/tests/test_feature_agglomeration.py @@ -4,7 +4,7 @@ # Authors: Sergul Aydore 2017 import numpy as np from sklearn.cluster import FeatureAgglomeration -from sklearn.utils.testing import assert_true, assert_no_warnings +from sklearn.utils.testing import assert_no_warnings from sklearn.utils.testing import assert_array_almost_equal diff --git a/sklearn/cluster/tests/test_hierarchical.py b/sklearn/cluster/tests/test_hierarchical.py index 5910820ee6ce1..7a42fe12496ee 100644 --- a/sklearn/cluster/tests/test_hierarchical.py +++ b/sklearn/cluster/tests/test_hierarchical.py @@ -14,7 +14,6 @@ from scipy import sparse from scipy.cluster import hierarchy -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_raises from sklearn.utils.testing import assert_equal from sklearn.utils.testing import assert_almost_equal diff --git a/sklearn/cluster/tests/test_k_means.py b/sklearn/cluster/tests/test_k_means.py index b7ba8c483cb5e..cec0fa2897546 100644 --- a/sklearn/cluster/tests/test_k_means.py +++ b/sklearn/cluster/tests/test_k_means.py @@ -13,7 +13,6 @@ from sklearn.utils.testing import assert_almost_equal from sklearn.utils.testing import assert_raises from sklearn.utils.testing import assert_raises_regex -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_greater from sklearn.utils.testing import assert_less from sklearn.utils.testing import assert_warns diff --git a/sklearn/cluster/tests/test_mean_shift.py b/sklearn/cluster/tests/test_mean_shift.py index e75ed3451cbaa..08649b461383d 100644 --- a/sklearn/cluster/tests/test_mean_shift.py +++ b/sklearn/cluster/tests/test_mean_shift.py @@ -10,7 +10,6 @@ from sklearn.utils.testing import assert_equal from sklearn.utils.testing import assert_false -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_array_equal from sklearn.utils.testing import assert_array_almost_equal from sklearn.utils.testing import assert_raise_message diff --git a/sklearn/compose/tests/test_column_transformer.py b/sklearn/compose/tests/test_column_transformer.py index 10b81cd0c1f9d..b7631336ef3dd 100644 --- a/sklearn/compose/tests/test_column_transformer.py +++ b/sklearn/compose/tests/test_column_transformer.py @@ -9,7 +9,6 @@ from sklearn.utils.testing import assert_raises from sklearn.utils.testing import assert_raise_message from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_false from sklearn.utils.testing import assert_dict_equal from sklearn.utils.testing import assert_array_equal diff --git a/sklearn/cross_decomposition/tests/test_pls.py b/sklearn/cross_decomposition/tests/test_pls.py index 7160cd704d9a3..4c9a58e52e29c 100644 --- a/sklearn/cross_decomposition/tests/test_pls.py +++ b/sklearn/cross_decomposition/tests/test_pls.py @@ -2,8 +2,8 @@ from numpy.testing import assert_approx_equal from sklearn.utils.testing import (assert_equal, assert_array_almost_equal, - assert_array_equal, assert_true, - assert_raise_message, assert_warns) + assert_array_equal, assert_raise_message, + assert_warns) from sklearn.datasets import load_linnerud from sklearn.cross_decomposition import pls_, CCA from sklearn.preprocessing import StandardScaler diff --git a/sklearn/datasets/tests/test_20news.py b/sklearn/datasets/tests/test_20news.py index 95be2c6a7faae..90b09614b7a3a 100644 --- a/sklearn/datasets/tests/test_20news.py +++ b/sklearn/datasets/tests/test_20news.py @@ -3,7 +3,6 @@ import scipy.sparse as sp from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_true from sklearn.utils.testing import SkipTest from sklearn.datasets.tests.test_common import check_return_X_y from functools import partial diff --git a/sklearn/datasets/tests/test_base.py b/sklearn/datasets/tests/test_base.py index fbe282b057644..e01ec39eb4943 100644 --- a/sklearn/datasets/tests/test_base.py +++ b/sklearn/datasets/tests/test_base.py @@ -28,7 +28,6 @@ from sklearn.externals._pilutil import pillow_installed from sklearn.utils.testing import assert_false -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_equal from sklearn.utils.testing import assert_raises diff --git a/sklearn/datasets/tests/test_rcv1.py b/sklearn/datasets/tests/test_rcv1.py index 1b1952d81e2a9..57627cc834c95 100644 --- a/sklearn/datasets/tests/test_rcv1.py +++ b/sklearn/datasets/tests/test_rcv1.py @@ -12,7 +12,6 @@ from sklearn.utils.testing import assert_almost_equal from sklearn.utils.testing import assert_array_equal from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_true from sklearn.utils.testing import SkipTest diff --git a/sklearn/datasets/tests/test_samples_generator.py b/sklearn/datasets/tests/test_samples_generator.py index 8567433a16920..2cf6900442feb 100644 --- a/sklearn/datasets/tests/test_samples_generator.py +++ b/sklearn/datasets/tests/test_samples_generator.py @@ -12,7 +12,6 @@ from sklearn.utils.testing import assert_array_equal from sklearn.utils.testing import assert_almost_equal from sklearn.utils.testing import assert_array_almost_equal -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_less from sklearn.utils.testing import assert_raises from sklearn.utils.testing import assert_raise_message diff --git a/sklearn/decomposition/tests/test_dict_learning.py b/sklearn/decomposition/tests/test_dict_learning.py index caeb0b9afe1e4..fd2937ed8f25d 100644 --- a/sklearn/decomposition/tests/test_dict_learning.py +++ b/sklearn/decomposition/tests/test_dict_learning.py @@ -11,7 +11,6 @@ from sklearn.utils.testing import assert_array_almost_equal from sklearn.utils.testing import assert_array_equal from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_less from sklearn.utils.testing import assert_raises from sklearn.utils.testing import ignore_warnings @@ -294,8 +293,7 @@ def test_dict_learning_online_partial_fit(): for sample in X: dict2.partial_fit(sample[np.newaxis, :]) - assert_true(not np.all(sparse_encode(X, dict1.components_, alpha=1) == - 0)) + assert not np.all(sparse_encode(X, dict1.components_, alpha=1) == 0) assert_array_almost_equal(dict1.components_, dict2.components_, decimal=2) diff --git a/sklearn/decomposition/tests/test_fastica.py b/sklearn/decomposition/tests/test_fastica.py index 08ff5737553a1..e834a00b03118 100644 --- a/sklearn/decomposition/tests/test_fastica.py +++ b/sklearn/decomposition/tests/test_fastica.py @@ -9,7 +9,6 @@ from sklearn.utils.testing import assert_almost_equal from sklearn.utils.testing import assert_array_almost_equal -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_less from sklearn.utils.testing import assert_equal from sklearn.utils.testing import assert_warns diff --git a/sklearn/decomposition/tests/test_nmf.py b/sklearn/decomposition/tests/test_nmf.py index 695e101cec5dd..981c5b5994803 100644 --- a/sklearn/decomposition/tests/test_nmf.py +++ b/sklearn/decomposition/tests/test_nmf.py @@ -9,7 +9,6 @@ import pytest -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_false from sklearn.utils.testing import assert_raise_message, assert_no_warnings from sklearn.utils.testing import assert_array_equal diff --git a/sklearn/decomposition/tests/test_online_lda.py b/sklearn/decomposition/tests/test_online_lda.py index 35aa882dc943d..7e06d28faefcf 100644 --- a/sklearn/decomposition/tests/test_online_lda.py +++ b/sklearn/decomposition/tests/test_online_lda.py @@ -12,7 +12,6 @@ _dirichlet_expectation_2d) from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_equal from sklearn.utils.testing import assert_array_almost_equal from sklearn.utils.testing import assert_almost_equal diff --git a/sklearn/decomposition/tests/test_pca.py b/sklearn/decomposition/tests/test_pca.py index faed4f567d730..84fabf5aa32df 100644 --- a/sklearn/decomposition/tests/test_pca.py +++ b/sklearn/decomposition/tests/test_pca.py @@ -6,7 +6,6 @@ from sklearn.utils.testing import assert_almost_equal from sklearn.utils.testing import assert_array_almost_equal -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_equal from sklearn.utils.testing import assert_greater from sklearn.utils.testing import assert_raise_message diff --git a/sklearn/decomposition/tests/test_sparse_pca.py b/sklearn/decomposition/tests/test_sparse_pca.py index 45bef740fa7fc..fdfe17d34a223 100644 --- a/sklearn/decomposition/tests/test_sparse_pca.py +++ b/sklearn/decomposition/tests/test_sparse_pca.py @@ -9,7 +9,6 @@ from sklearn.utils.testing import assert_array_almost_equal from sklearn.utils.testing import assert_equal from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_false from sklearn.utils.testing import assert_warns_message from sklearn.utils.testing import if_safe_multiprocessing_with_blas diff --git a/sklearn/ensemble/tests/test_bagging.py b/sklearn/ensemble/tests/test_bagging.py index b9553071be87d..5093f738ef2c5 100644 --- a/sklearn/ensemble/tests/test_bagging.py +++ b/sklearn/ensemble/tests/test_bagging.py @@ -16,7 +16,6 @@ from sklearn.utils.testing import assert_raises from sklearn.utils.testing import assert_greater from sklearn.utils.testing import assert_less -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_false from sklearn.utils.testing import assert_warns from sklearn.utils.testing import assert_warns_message @@ -590,8 +589,7 @@ def test_bagging_with_pipeline(): DecisionTreeClassifier()), max_features=2) estimator.fit(iris.data, iris.target) - assert_true(isinstance(estimator[0].steps[-1][1].random_state, - int)) + assert isinstance(estimator[0].steps[-1][1].random_state, int) class DummyZeroEstimator(BaseEstimator): diff --git a/sklearn/ensemble/tests/test_base.py b/sklearn/ensemble/tests/test_base.py index e7a02c50e0806..d283aadf65d73 100644 --- a/sklearn/ensemble/tests/test_base.py +++ b/sklearn/ensemble/tests/test_base.py @@ -10,7 +10,6 @@ from sklearn.utils.testing import assert_raise_message from sklearn.utils.testing import assert_not_equal -from sklearn.utils.testing import assert_true from sklearn.datasets import load_iris from sklearn.ensemble import BaggingClassifier diff --git a/sklearn/ensemble/tests/test_forest.py b/sklearn/ensemble/tests/test_forest.py index 4735440ea81ea..35ec8b37f058c 100644 --- a/sklearn/ensemble/tests/test_forest.py +++ b/sklearn/ensemble/tests/test_forest.py @@ -31,7 +31,7 @@ from sklearn.utils.testing import assert_array_almost_equal from sklearn.utils.testing import assert_array_equal from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_false, assert_true +from sklearn.utils.testing import assert_false from sklearn.utils.testing import assert_less, assert_greater from sklearn.utils.testing import assert_greater_equal from sklearn.utils.testing import assert_raises diff --git a/sklearn/ensemble/tests/test_gradient_boosting.py b/sklearn/ensemble/tests/test_gradient_boosting.py index f237695901f59..ee635e821f501 100644 --- a/sklearn/ensemble/tests/test_gradient_boosting.py +++ b/sklearn/ensemble/tests/test_gradient_boosting.py @@ -28,7 +28,6 @@ from sklearn.utils.testing import assert_less from sklearn.utils.testing import assert_raises from sklearn.utils.testing import assert_raise_message -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_warns from sklearn.utils.testing import assert_warns_message from sklearn.utils.testing import skip_if_32bit diff --git a/sklearn/ensemble/tests/test_weight_boosting.py b/sklearn/ensemble/tests/test_weight_boosting.py index a613e876c5de0..d61e55262a3bb 100755 --- a/sklearn/ensemble/tests/test_weight_boosting.py +++ b/sklearn/ensemble/tests/test_weight_boosting.py @@ -5,7 +5,7 @@ from sklearn.utils.testing import assert_array_equal, assert_array_less from sklearn.utils.testing import assert_array_almost_equal -from sklearn.utils.testing import assert_equal, assert_true, assert_greater +from sklearn.utils.testing import assert_equal, assert_greater from sklearn.utils.testing import assert_raises, assert_raises_regexp from sklearn.base import BaseEstimator diff --git a/sklearn/feature_extraction/tests/test_dict_vectorizer.py b/sklearn/feature_extraction/tests/test_dict_vectorizer.py index d5171cff46169..b20b946eb952c 100644 --- a/sklearn/feature_extraction/tests/test_dict_vectorizer.py +++ b/sklearn/feature_extraction/tests/test_dict_vectorizer.py @@ -10,7 +10,7 @@ import pytest from sklearn.utils.testing import (assert_equal, assert_in, - assert_false, assert_true) + assert_false) from sklearn.feature_extraction import DictVectorizer from sklearn.feature_selection import SelectKBest, chi2 diff --git a/sklearn/feature_extraction/tests/test_feature_hasher.py b/sklearn/feature_extraction/tests/test_feature_hasher.py index 3acc3cb74f335..e3472682da7b2 100644 --- a/sklearn/feature_extraction/tests/test_feature_hasher.py +++ b/sklearn/feature_extraction/tests/test_feature_hasher.py @@ -4,7 +4,7 @@ from numpy.testing import assert_array_equal from sklearn.feature_extraction import FeatureHasher -from sklearn.utils.testing import (assert_raises, assert_true, assert_equal, +from sklearn.utils.testing import (assert_raises, assert_equal, ignore_warnings, fails_if_pypy) pytestmark = fails_if_pypy diff --git a/sklearn/feature_extraction/tests/test_text.py b/sklearn/feature_extraction/tests/test_text.py index c674472d8828a..503c62b2b3de3 100644 --- a/sklearn/feature_extraction/tests/test_text.py +++ b/sklearn/feature_extraction/tests/test_text.py @@ -28,7 +28,7 @@ from numpy.testing import assert_array_almost_equal from numpy.testing import assert_array_equal from sklearn.utils import IS_PYPY -from sklearn.utils.testing import (assert_equal, assert_false, assert_true, +from sklearn.utils.testing import (assert_equal, assert_false, assert_not_equal, assert_almost_equal, assert_in, assert_less, assert_greater, assert_warns_message, assert_raise_message, @@ -628,14 +628,14 @@ def test_vectorizer_max_df(): vect.max_df = 0.5 # 0.5 * 3 documents -> max_doc_count == 1.5 vect.fit(test_data) - assert_true('a' not in vect.vocabulary_.keys()) # {ae} ignored + assert 'a' not in vect.vocabulary_.keys() # {ae} ignored assert_equal(len(vect.vocabulary_.keys()), 4) # {bcdt} remain assert 'a' in vect.stop_words_ assert_equal(len(vect.stop_words_), 2) vect.max_df = 1 vect.fit(test_data) - assert_true('a' not in vect.vocabulary_.keys()) # {ae} ignored + assert 'a' not in vect.vocabulary_.keys() # {ae} ignored assert_equal(len(vect.vocabulary_.keys()), 4) # {bcdt} remain assert 'a' in vect.stop_words_ assert_equal(len(vect.stop_words_), 2) @@ -651,14 +651,14 @@ def test_vectorizer_min_df(): vect.min_df = 2 vect.fit(test_data) - assert_true('c' not in vect.vocabulary_.keys()) # {bcdt} ignored + assert 'c' not in vect.vocabulary_.keys() # {bcdt} ignored assert_equal(len(vect.vocabulary_.keys()), 2) # {ae} remain assert 'c' in vect.stop_words_ assert_equal(len(vect.stop_words_), 4) vect.min_df = 0.8 # 0.8 * 3 documents -> min_doc_count == 2.4 vect.fit(test_data) - assert_true('c' not in vect.vocabulary_.keys()) # {bcdet} ignored + assert 'c' not in vect.vocabulary_.keys() # {bcdet} ignored assert_equal(len(vect.vocabulary_.keys()), 1) # {a} remains assert 'c' in vect.stop_words_ assert_equal(len(vect.stop_words_), 5) diff --git a/sklearn/feature_selection/tests/test_feature_select.py b/sklearn/feature_selection/tests/test_feature_select.py index 90052db47a63c..8292c87cfd216 100644 --- a/sklearn/feature_selection/tests/test_feature_select.py +++ b/sklearn/feature_selection/tests/test_feature_select.py @@ -10,7 +10,6 @@ from sklearn.utils.testing import assert_equal from sklearn.utils.testing import assert_almost_equal from sklearn.utils.testing import assert_raises -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_array_equal from sklearn.utils.testing import assert_array_almost_equal from sklearn.utils.testing import assert_not_in diff --git a/sklearn/feature_selection/tests/test_from_model.py b/sklearn/feature_selection/tests/test_from_model.py index 868f7e5445aa4..139f564b1d7b2 100644 --- a/sklearn/feature_selection/tests/test_from_model.py +++ b/sklearn/feature_selection/tests/test_from_model.py @@ -1,7 +1,6 @@ import pytest import numpy as np -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_false from sklearn.utils.testing import assert_equal from sklearn.utils.testing import assert_less diff --git a/sklearn/feature_selection/tests/test_rfe.py b/sklearn/feature_selection/tests/test_rfe.py index 60dfad7c24512..30307fa28902b 100644 --- a/sklearn/feature_selection/tests/test_rfe.py +++ b/sklearn/feature_selection/tests/test_rfe.py @@ -18,7 +18,7 @@ from sklearn.utils import check_random_state from sklearn.utils.testing import ignore_warnings -from sklearn.utils.testing import assert_greater, assert_equal, assert_true +from sklearn.utils.testing import assert_greater, assert_equal from sklearn.metrics import make_scorer from sklearn.metrics import get_scorer diff --git a/sklearn/linear_model/tests/test_least_angle.py b/sklearn/linear_model/tests/test_least_angle.py index c3c7a50ae7136..f1b3a0c2de298 100644 --- a/sklearn/linear_model/tests/test_least_angle.py +++ b/sklearn/linear_model/tests/test_least_angle.py @@ -10,7 +10,6 @@ from sklearn.model_selection import train_test_split from sklearn.utils.testing import assert_equal from sklearn.utils.testing import assert_array_almost_equal -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_false from sklearn.utils.testing import assert_less from sklearn.utils.testing import assert_greater diff --git a/sklearn/linear_model/tests/test_logistic.py b/sklearn/linear_model/tests/test_logistic.py index 1a40684c56698..fbc45dc40dfe9 100644 --- a/sklearn/linear_model/tests/test_logistic.py +++ b/sklearn/linear_model/tests/test_logistic.py @@ -21,7 +21,6 @@ from sklearn.utils.testing import assert_greater from sklearn.utils.testing import assert_raise_message from sklearn.utils.testing import assert_raises -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_warns from sklearn.utils.testing import ignore_warnings from sklearn.utils.testing import assert_warns_message diff --git a/sklearn/linear_model/tests/test_passive_aggressive.py b/sklearn/linear_model/tests/test_passive_aggressive.py index d02169da5e3cd..d3ae2070297a0 100644 --- a/sklearn/linear_model/tests/test_passive_aggressive.py +++ b/sklearn/linear_model/tests/test_passive_aggressive.py @@ -1,4 +1,3 @@ -from sklearn.utils.testing import assert_true import numpy as np import scipy.sparse as sp diff --git a/sklearn/linear_model/tests/test_ridge.py b/sklearn/linear_model/tests/test_ridge.py index feee05dd35e28..eca4a53f4f507 100644 --- a/sklearn/linear_model/tests/test_ridge.py +++ b/sklearn/linear_model/tests/test_ridge.py @@ -5,7 +5,6 @@ import pytest -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_almost_equal from sklearn.utils.testing import assert_array_almost_equal from sklearn.utils.testing import assert_equal diff --git a/sklearn/linear_model/tests/test_sgd.py b/sklearn/linear_model/tests/test_sgd.py index a89b32a46e747..d8ef7f5c42097 100644 --- a/sklearn/linear_model/tests/test_sgd.py +++ b/sklearn/linear_model/tests/test_sgd.py @@ -1,4 +1,3 @@ - from distutils.version import LooseVersion import pickle import unittest @@ -13,7 +12,7 @@ from sklearn.utils.testing import assert_greater from sklearn.utils.testing import assert_less from sklearn.utils.testing import assert_raises -from sklearn.utils.testing import assert_false, assert_true +from sklearn.utils.testing import assert_false from sklearn.utils.testing import assert_equal from sklearn.utils.testing import assert_raises_regexp from sklearn.utils.testing import assert_warns diff --git a/sklearn/linear_model/tests/test_sparse_coordinate_descent.py b/sklearn/linear_model/tests/test_sparse_coordinate_descent.py index a869158036ad1..6def1fa546da8 100644 --- a/sklearn/linear_model/tests/test_sparse_coordinate_descent.py +++ b/sklearn/linear_model/tests/test_sparse_coordinate_descent.py @@ -5,7 +5,6 @@ from sklearn.utils.testing import assert_almost_equal from sklearn.utils.testing import assert_equal from sklearn.utils.testing import assert_less -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_greater from sklearn.utils.testing import ignore_warnings diff --git a/sklearn/manifold/tests/test_locally_linear.py b/sklearn/manifold/tests/test_locally_linear.py index 2f5c0bd9b40a0..a1d48fd49e999 100644 --- a/sklearn/manifold/tests/test_locally_linear.py +++ b/sklearn/manifold/tests/test_locally_linear.py @@ -10,7 +10,6 @@ from sklearn.utils.testing import ignore_warnings from sklearn.utils.testing import assert_raise_message from sklearn.utils.testing import assert_raises -from sklearn.utils.testing import assert_true eigen_solvers = ['dense', 'arpack'] diff --git a/sklearn/manifold/tests/test_spectral_embedding.py b/sklearn/manifold/tests/test_spectral_embedding.py index 1db82b889469f..bc9a718271271 100644 --- a/sklearn/manifold/tests/test_spectral_embedding.py +++ b/sklearn/manifold/tests/test_spectral_embedding.py @@ -17,7 +17,7 @@ from sklearn.utils.extmath import _deterministic_vector_sign_flip from sklearn.utils.testing import assert_array_almost_equal from sklearn.utils.testing import assert_array_equal -from sklearn.utils.testing import assert_true, assert_equal, assert_raises +from sklearn.utils.testing import assert_equal, assert_raises from sklearn.utils.testing import SkipTest @@ -160,8 +160,7 @@ def test_spectral_embedding_callable_affinity(seed=36): assert_array_almost_equal( se_callable.affinity_matrix_, se_rbf.affinity_matrix_) assert_array_almost_equal(kern, se_rbf.affinity_matrix_) - assert_true( - _check_with_col_sign_flipping(embed_rbf, embed_callable, 0.05)) + assert _check_with_col_sign_flipping(embed_rbf, embed_callable, 0.05) def test_spectral_embedding_amg_solver(seed=36): diff --git a/sklearn/metrics/tests/test_pairwise.py b/sklearn/metrics/tests/test_pairwise.py index 384e4685f92cf..05c5f48e45340 100644 --- a/sklearn/metrics/tests/test_pairwise.py +++ b/sklearn/metrics/tests/test_pairwise.py @@ -16,7 +16,6 @@ from sklearn.utils.testing import assert_array_equal from sklearn.utils.testing import assert_raises from sklearn.utils.testing import assert_raises_regexp -from sklearn.utils.testing import assert_true from sklearn.utils.testing import ignore_warnings from sklearn.utils.testing import assert_warns_message diff --git a/sklearn/mixture/tests/test_gaussian_mixture.py b/sklearn/mixture/tests/test_gaussian_mixture.py index 752d3040f536c..63ab5735252b8 100644 --- a/sklearn/mixture/tests/test_gaussian_mixture.py +++ b/sklearn/mixture/tests/test_gaussian_mixture.py @@ -34,7 +34,6 @@ from sklearn.utils.testing import assert_greater from sklearn.utils.testing import assert_greater_equal from sklearn.utils.testing import assert_raise_message -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_warns_message from sklearn.utils.testing import ignore_warnings diff --git a/sklearn/neighbors/tests/test_neighbors.py b/sklearn/neighbors/tests/test_neighbors.py index 23707d539b109..95dbdd13b5e6a 100644 --- a/sklearn/neighbors/tests/test_neighbors.py +++ b/sklearn/neighbors/tests/test_neighbors.py @@ -22,7 +22,6 @@ from sklearn.utils.testing import assert_in from sklearn.utils.testing import assert_raises from sklearn.utils.testing import assert_raises_regex -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_warns from sklearn.utils.testing import assert_warns_message from sklearn.utils.testing import ignore_warnings @@ -786,8 +785,7 @@ def test_kneighbors_regressor_sparse(n_samples=40, if issparse(sparsev(X2_pre)): assert_raises(ValueError, knn_pre.predict, X2_pre) else: - assert_true( - np.mean(knn_pre.predict(X2_pre).round() == y) > 0.95) + assert np.mean(knn_pre.predict(X2_pre).round() == y) > 0.95 def test_neighbors_iris(): diff --git a/sklearn/neural_network/tests/test_stochastic_optimizers.py b/sklearn/neural_network/tests/test_stochastic_optimizers.py index 1c54556521ef7..bb4d11c4b0813 100644 --- a/sklearn/neural_network/tests/test_stochastic_optimizers.py +++ b/sklearn/neural_network/tests/test_stochastic_optimizers.py @@ -3,8 +3,8 @@ from sklearn.neural_network._stochastic_optimizers import (BaseOptimizer, SGDOptimizer, AdamOptimizer) -from sklearn.utils.testing import (assert_array_equal, assert_true, - assert_false, assert_equal) +from sklearn.utils.testing import (assert_array_equal, assert_false, + assert_equal) shapes = [(4, 6), (6, 8), (7, 8, 9)] diff --git a/sklearn/preprocessing/tests/test_data.py b/sklearn/preprocessing/tests/test_data.py index 6f459ffdc2012..3a1640ddbeb05 100644 --- a/sklearn/preprocessing/tests/test_data.py +++ b/sklearn/preprocessing/tests/test_data.py @@ -47,7 +47,6 @@ def sparse_random(num_rows, num_cols, density, random_state=None): from sklearn.utils.testing import assert_less_equal from sklearn.utils.testing import assert_raises from sklearn.utils.testing import assert_raises_regex -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_false from sklearn.utils.testing import assert_warns_message from sklearn.utils.testing import assert_no_warnings diff --git a/sklearn/preprocessing/tests/test_label.py b/sklearn/preprocessing/tests/test_label.py index e2af179e338e9..2bec46e551f2e 100644 --- a/sklearn/preprocessing/tests/test_label.py +++ b/sklearn/preprocessing/tests/test_label.py @@ -13,7 +13,6 @@ from sklearn.utils.testing import assert_array_equal from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_raises from sklearn.utils.testing import assert_raise_message from sklearn.utils.testing import assert_warns_message diff --git a/sklearn/svm/tests/test_sparse.py b/sklearn/svm/tests/test_sparse.py index 069b68a7290e1..880eeda6476ee 100644 --- a/sklearn/svm/tests/test_sparse.py +++ b/sklearn/svm/tests/test_sparse.py @@ -10,9 +10,9 @@ from sklearn.svm.tests import test_svm from sklearn.exceptions import ConvergenceWarning from sklearn.utils.extmath import safe_sparse_dot -from sklearn.utils.testing import (assert_raises, assert_true, assert_false, - assert_warns, assert_raise_message, - ignore_warnings, skip_if_32bit) +from sklearn.utils.testing import (assert_raises, assert_false, assert_warns, + assert_raise_message, ignore_warnings, + skip_if_32bit) # test sample 1 diff --git a/sklearn/tests/test_discriminant_analysis.py b/sklearn/tests/test_discriminant_analysis.py index f11c38f28f7b7..f2146dc3daccc 100644 --- a/sklearn/tests/test_discriminant_analysis.py +++ b/sklearn/tests/test_discriminant_analysis.py @@ -6,7 +6,6 @@ from sklearn.utils.testing import assert_array_almost_equal from sklearn.utils.testing import assert_equal from sklearn.utils.testing import assert_almost_equal -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_false from sklearn.utils.testing import assert_raises from sklearn.utils.testing import assert_raise_message diff --git a/sklearn/tests/test_dummy.py b/sklearn/tests/test_dummy.py index 99b038bd4086f..96b50457f2830 100644 --- a/sklearn/tests/test_dummy.py +++ b/sklearn/tests/test_dummy.py @@ -11,7 +11,6 @@ from sklearn.utils.testing import assert_equal from sklearn.utils.testing import assert_almost_equal from sklearn.utils.testing import assert_raises -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_warns_message from sklearn.utils.testing import ignore_warnings from sklearn.utils.stats import _weighted_percentile diff --git a/sklearn/tests/test_multiclass.py b/sklearn/tests/test_multiclass.py index e472f6c3ea49a..7b46fa0bf14f5 100644 --- a/sklearn/tests/test_multiclass.py +++ b/sklearn/tests/test_multiclass.py @@ -8,7 +8,6 @@ from sklearn.utils.testing import assert_array_equal from sklearn.utils.testing import assert_equal from sklearn.utils.testing import assert_almost_equal -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_false from sklearn.utils.testing import assert_raises from sklearn.utils.testing import assert_warns diff --git a/sklearn/tests/test_pipeline.py b/sklearn/tests/test_pipeline.py index d4193182c7405..7d44925d055d0 100644 --- a/sklearn/tests/test_pipeline.py +++ b/sklearn/tests/test_pipeline.py @@ -16,7 +16,6 @@ from sklearn.utils.testing import assert_raise_message from sklearn.utils.testing import assert_equal from sklearn.utils.testing import assert_false -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_array_equal from sklearn.utils.testing import assert_array_almost_equal from sklearn.utils.testing import assert_dict_equal diff --git a/sklearn/utils/tests/test_class_weight.py b/sklearn/utils/tests/test_class_weight.py index 36309f2dccdad..7226109f33d65 100644 --- a/sklearn/utils/tests/test_class_weight.py +++ b/sklearn/utils/tests/test_class_weight.py @@ -11,7 +11,6 @@ from sklearn.utils.testing import assert_almost_equal from sklearn.utils.testing import assert_raises from sklearn.utils.testing import assert_raise_message -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_equal diff --git a/sklearn/utils/tests/test_estimator_checks.py b/sklearn/utils/tests/test_estimator_checks.py index 961329ee46218..e82bc6057f1b1 100644 --- a/sklearn/utils/tests/test_estimator_checks.py +++ b/sklearn/utils/tests/test_estimator_checks.py @@ -9,9 +9,8 @@ from sklearn.base import BaseEstimator, ClassifierMixin from sklearn.utils import deprecated -from sklearn.utils.testing import (assert_raises_regex, assert_true, - assert_equal, ignore_warnings, - assert_warns) +from sklearn.utils.testing import (assert_raises_regex, assert_equal, + ignore_warnings, assert_warns) from sklearn.utils.estimator_checks import check_estimator from sklearn.utils.estimator_checks import set_random_state from sklearn.utils.estimator_checks import set_checking_parameters diff --git a/sklearn/utils/tests/test_extmath.py b/sklearn/utils/tests/test_extmath.py index 7ea33139d92f0..cc35348ac10ac 100644 --- a/sklearn/utils/tests/test_extmath.py +++ b/sklearn/utils/tests/test_extmath.py @@ -16,7 +16,6 @@ from sklearn.utils.testing import assert_allclose from sklearn.utils.testing import assert_array_equal from sklearn.utils.testing import assert_array_almost_equal -from sklearn.utils.testing import assert_true from sklearn.utils.testing import assert_false from sklearn.utils.testing import assert_greater from sklearn.utils.testing import assert_warns diff --git a/sklearn/utils/tests/test_random.py b/sklearn/utils/tests/test_random.py index c174500e73362..43958941ee3c8 100644 --- a/sklearn/utils/tests/test_random.py +++ b/sklearn/utils/tests/test_random.py @@ -9,8 +9,7 @@ from sklearn.utils.testing import ( assert_raises, - assert_equal, - assert_true) + assert_equal) ############################################################################### diff --git a/sklearn/utils/tests/test_utils.py b/sklearn/utils/tests/test_utils.py index 0b88cead5e790..e9f469f202619 100644 --- a/sklearn/utils/tests/test_utils.py +++ b/sklearn/utils/tests/test_utils.py @@ -5,7 +5,7 @@ import numpy as np import scipy.sparse as sp -from sklearn.utils.testing import (assert_equal, assert_raises, assert_true, +from sklearn.utils.testing import (assert_equal, assert_raises, assert_array_equal, SkipTest, assert_raises_regex, assert_warns_message, assert_no_warnings) diff --git a/sklearn/utils/tests/test_validation.py b/sklearn/utils/tests/test_validation.py index 843479c9e6696..55bfbb1f7e78c 100644 --- a/sklearn/utils/tests/test_validation.py +++ b/sklearn/utils/tests/test_validation.py @@ -12,7 +12,7 @@ import scipy.sparse as sp from scipy import __version__ as scipy_version -from sklearn.utils.testing import assert_true, assert_false, assert_equal +from sklearn.utils.testing import assert_false, assert_equal from sklearn.utils.testing import assert_raises from sklearn.utils.testing import assert_raises_regex from sklearn.utils.testing import assert_no_warnings