Skip to content

Commit e9e1ea5

Browse files
committed
FIX remove .description from test generators as this is not thread-safe.
1 parent 9e9a656 commit e9e1ea5

File tree

1 file changed

+0
-39
lines changed

1 file changed

+0
-39
lines changed

sklearn/tests/test_common.py

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ def test_all_estimators():
6666
# some can just not be sensibly default constructed
6767
if name in dont_test:
6868
continue
69-
check_parameters_default_constructible.description = \
70-
"check_parameters_default_constructible(%s)" % name
7169
yield check_parameters_default_constructible, name, Estimator
7270

7371

@@ -145,8 +143,6 @@ def test_estimators_sparse_data():
145143
for name, Estimator in estimators:
146144
if name in dont_test:
147145
continue
148-
check_regressors_classifiers_sparse_data.description = \
149-
"check_regressors_classifiers_sparse_data(%s)" % name
150146
yield check_regressors_classifiers_sparse_data, name, Estimator, X, y
151147

152148

@@ -192,7 +188,6 @@ def test_transformers():
192188
# these don't actually fit the data:
193189
if name in ['AdditiveChi2Sampler', 'Binarizer', 'Normalizer']:
194190
continue
195-
check_transformer.description = "check_transformer(%s)" % name
196191
yield check_transformer, name, Transformer, X, y
197192

198193

@@ -278,8 +273,6 @@ def test_transformers_sparse_data():
278273
for name, Transformer in estimators:
279274
if name in dont_test:
280275
continue
281-
check_transformer_sparse_data.description =\
282-
"check_transformer_sparse_data(%s)" % name
283276
yield check_transformer_sparse_data, name, Transformer, X, y
284277

285278

@@ -337,8 +330,6 @@ def test_estimators_nan_inf():
337330
if name in ('PLSCanonical', 'PLSRegression', 'CCA',
338331
'PLSSVD', 'Imputer'): # Imputer accepts nan
339332
continue
340-
check_estimators_nan_inf.description =\
341-
"check_estimators_nan_inf(%s)" % name
342333
yield (check_estimators_nan_inf, name, Estimator, X_train,
343334
X_train_finite, y)
344335

@@ -431,8 +422,6 @@ def test_transformers_pickle():
431422
for name, Transformer in transformers:
432423
if name in dont_test:
433424
continue
434-
check_transformer_pickle.description =\
435-
"check_transformer_pickle(%s)" % name
436425
yield check_transformer_pickle, name, Transformer, X, y
437426

438427

@@ -486,8 +475,6 @@ def test_classifiers_one_label():
486475
for name, Classifier in classifiers:
487476
if name in dont_test:
488477
continue
489-
check_classifiers_one_label.description =\
490-
"check_classifier_one_labels(%s)" % name
491478
yield check_classifiers_one_label, name, Classifier, X_train, X_test, y
492479

493480

@@ -533,7 +520,6 @@ def test_clustering():
533520
# this is clustering on the features
534521
# let's not test that here.
535522
continue
536-
check_clustering.description = "check_clustering(%s)" % name
537523
yield check_clustering, name, Alg, X, y
538524

539525

@@ -581,8 +567,6 @@ def test_classifiers_train():
581567
if name in ['MultinomialNB', 'BernoulliNB']:
582568
# TODO also test these!
583569
continue
584-
check_classifiers_train.description =\
585-
"check_classifiers(%s)" % name
586570
yield check_classifiers_train, name, Classifier, X, y
587571

588572

@@ -660,8 +644,6 @@ def test_classifiers_classes():
660644
if name in ['MultinomialNB', 'BernoulliNB']:
661645
# TODO also test these!
662646
continue
663-
check_classifiers_classes.description =\
664-
"check_classifier_classes(%s)" % name
665647
yield check_classifiers_classes, name, Classifier, X, y, y_names
666648

667649

@@ -715,8 +697,6 @@ def test_classifiers_input_shapes():
715697
# We don't raise a warning in these classifiers, as
716698
# the column y interface is used by the forests.
717699
continue
718-
check_classifiers_input_shapes.description =\
719-
"check_classifiers_input_shapes(%s)" % name
720700
yield check_classifiers_input_shapes, name, Classifier, X, y
721701

722702

@@ -758,8 +738,6 @@ def test_classifiers_pickle():
758738
if name in ['MultinomialNB', 'BernoulliNB']:
759739
# TODO also test these!
760740
continue
761-
check_classifiers_pickle.description =\
762-
"check_classifiers_pickle(%s, %d)" % (name, len(np.unique(y)))
763741
yield check_classifiers_pickle, name, Classifier, X, y
764742

765743

@@ -806,7 +784,6 @@ def test_regressors_int():
806784
for name, Regressor in regressors:
807785
if name in dont_test or name in ('CCA'):
808786
continue
809-
check_regressors_int.description = "check_regressors_int(%s)" % name
810787
yield check_regressors_int, name, Regressor, X, y
811788

812789

@@ -843,8 +820,6 @@ def test_regressors_train():
843820
for name, Regressor in regressors:
844821
if name in dont_test:
845822
continue
846-
check_regressors_train.description =\
847-
"check_regressors_train(%s)" % name
848823
yield check_regressors_train, name, Regressor, X, y
849824

850825

@@ -886,8 +861,6 @@ def test_regressor_pickle():
886861
for name, Regressor in regressors:
887862
if name in dont_test:
888863
continue
889-
check_regressors_pickle.description =\
890-
"check_regressors_pickle(%s)" % name
891864
yield check_regressors_pickle, name, Regressor, X, y
892865

893866

@@ -960,8 +933,6 @@ def test_class_weight_classifiers():
960933
# NaiveBayes classifiers have a somewhat different interface.
961934
# FIXME SOON!
962935
continue
963-
check_class_weight_classifiers.description =\
964-
"check_class_weight_classfiers(%s, %d)" % (name, n_centers)
965936
yield (check_class_weight_classifiers, name, Classifier, X_train,
966937
y_train, X_test, y_test)
967938

@@ -1024,8 +995,6 @@ def test_class_weight_auto_classifies():
1024995
# NaiveBayes classifiers have a somewhat different interface.
1025996
# FIXME SOON!
1026997
continue
1027-
check_class_weight_auto_classifiers.description =\
1028-
"check_class_weight_auto_classifiers(%s, %d)" % (name, n_classes)
1029998
yield (check_class_weight_auto_classifiers, name, Classifier,
1030999
X_train, y_train, X_test, y_test, weights)
10311000

@@ -1063,8 +1032,6 @@ def test_estimators_overwrite_params():
10631032
# FIXME!
10641033
# in particular GaussianProcess!
10651034
continue
1066-
check_estimators_overwrite_params.description =\
1067-
"check_estimators_overwrite_params(%s)" % name
10681035
yield check_estimators_overwrite_params, name, Estimator, X, y
10691036

10701037

@@ -1106,8 +1073,6 @@ def test_cluster_overwrite_params():
11061073
# some want non-negative input
11071074
X
11081075
for name, Clustering in clusterers:
1109-
check_cluster_overwrite_params.description =\
1110-
"check_cluster_overwrite_params(%s)" % name
11111076
yield check_cluster_overwrite_params, name, Clustering, X, y
11121077

11131078

@@ -1156,8 +1121,6 @@ def test_sparsify_estimators():
11561121
Estimator.sparsify
11571122
except:
11581123
continue
1159-
check_sparsify_binary_classifier.description =\
1160-
"check_sparsify_binary_classifiers(%s)" % name
11611124
yield check_sparsify_binary_classifier, name, Estimator, X, y
11621125

11631126
# test multiclass classification
@@ -1168,8 +1131,6 @@ def test_sparsify_estimators():
11681131
Classifier.sparsify
11691132
except:
11701133
continue
1171-
check_sparsify_multiclass_classifier.description =\
1172-
"check_sparsify_multiclass_classifiers(%s)" % name
11731134
yield check_sparsify_multiclass_classifier, name, Classifier, X, y
11741135

11751136

0 commit comments

Comments
 (0)