MAINT make pytest collect everything that doesn't fail

scikit-learn · Sep 27, 2017 · b53b191 · b53b191
1 parent 5ddda43
commit b53b191
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/doc/tutorial/text_analytics/skeletons/exercise_01_language_train_model.py b/doc/tutorial/text_analytics/skeletons/exercise_01_language_train_model.py
@@ -46,7 +46,7 @@
 cm = metrics.confusion_matrix(y_test, y_predicted)
 print(cm)
 
-#import matplotlib.pyplot as plt
+#import matlotlib.pyplot as plt
 #plt.matshow(cm, cmap=plt.cm.jet)
 #plt.show()
 

diff --git a/doc/tutorial/text_analytics/skeletons/exercise_02_sentiment.py b/doc/tutorial/text_analytics/skeletons/exercise_02_sentiment.py
@@ -44,8 +44,8 @@
     # more useful.
     # Fit the pipeline on the training set using grid search for the parameters
 
-    # TASK: print the cross-validated scores for the each parameters set
-    # explored by the grid search
+    # TASK: print the mean and std for each candidate along with the parameter
+    # settings for all the candidates explored by grid search.
 
     # TASK: Predict the outcome on the testing set and store it in a variable
     # named y_predicted

diff --git a/setup.cfg b/setup.cfg
@@ -27,11 +27,22 @@ ignore-files=^setup\.py$
 # rewrite tests using yield with parametrize
 addopts =
     --doctest-modules
+    --doctest-glob='*.rst'
     --disable-pytest-warnings
     --ignore=benchmarks/
-    --ignore=doc/
     --ignore=examples/
     --ignore=setup.py
+    --ignore=doc/conf.py
+    --ignore=doc/sphinxext/sphinx_issues.py
+    --ignore=doc/tutorial/machine_learning_map/
+    --ignore=doc/tutorial/text_analytics/data/languages/fetch_data.py
+    --ignore=doc/tutorial/text_analytics/skeletons/exercise_01_language_train_model.py
+    --ignore=doc/tutorial/text_analytics/solutions/exercise_01_language_train_model.py
+    # ignore packages that fail with py._path.local.LocalPath.ImportMismatchError
+    # (cf pytest-dev/pytest#2042)
+    --ignore=doc/tutorial/text_analytics/data/movie_reviews/fetch_data.py
+    --ignore=doc/tutorial/text_analytics/data/twenty_newsgroups/fetch_data.py
+    --ignore=doc/tutorial/text_analytics/solutions/exercise_02_sentiment.py
 
 [wheelhouse_uploader]
 artifact_indexes=