FIX scikit-learn#1417: move nosetests configuration parameter to setup.cfg

ogrisel · ogrisel · commit d454c13f9f6e · 2012-12-01T10:56:12.000+01:00
diff --git a/Makefile b/Makefile
@@ -31,14 +31,12 @@ inplace:
 test-code: in
 	$(NOSETESTS) -s sklearn
 test-doc:
-	$(NOSETESTS) -s --with-doctest --doctest-tests --doctest-extension=rst \
-	--doctest-extension=inc --doctest-fixtures=_fixture doc/ doc/modules/ \
+	$(NOSETESTS) -s doc/ doc/modules/ doc/datasets/ \
 	doc/developers doc/tutorial/basic doc/tutorial/statistical_inference
 
 test-coverage:
 	rm -rf coverage .coverage
-	$(NOSETESTS) -s --with-coverage --cover-html --cover-html-dir=coverage \
-	--cover-package=sklearn sklearn
+	$(NOSETESTS) -s --with-coverage sklearn
 
 test: test-code test-doc
 
diff --git a/doc/datasets/index.rst b/doc/datasets/index.rst
@@ -172,11 +172,11 @@ features::
  _`Faster API-compatible implementation`: https://github.com/mblondel/svmlight-loader
 
 
-.. include:: olivetti_faces.inc
+.. include:: olivetti_faces.rst
 
-.. include:: twenty_newsgroups.inc
+.. include:: twenty_newsgroups.rst
 
-.. include:: mldata.inc
+.. include:: mldata.rst
 
-.. include:: labeled_faces.inc
+.. include:: labeled_faces.rst
 
diff --git a/doc/datasets/labeled_faces.rst b/doc/datasets/labeled_faces.rst
@@ -115,5 +115,3 @@ Examples
 --------
 
 :ref:`example_applications_face_recognition.py`
-
-
diff --git a/doc/datasets/mldata.rst b/doc/datasets/mldata.rst
@@ -68,5 +68,3 @@ datasets:
     ...                      data_home=custom_data_home)
     >>> iris3 = fetch_mldata('datasets-UCI iris', target_name='class',
     ...                      data_name='double0', data_home=custom_data_home)
-
-
diff --git a/doc/datasets/olivetti_faces.rst b/doc/datasets/olivetti_faces.rst
diff --git a/doc/datasets/twenty_newsgroups.rst b/doc/datasets/twenty_newsgroups.rst
@@ -9,7 +9,7 @@ and the other one for testing (or for performance evaluation). The split
 between the train and test set is based upon a messages posted before
 and after a specific date.
 
-This module contains two loaders. The first one, 
+This module contains two loaders. The first one,
 ``sklearn.datasets.fetch_20newsgroups``,
 returns a list of the raw text files that can be fed to text feature
 extractors such as :class:`sklearn.feature_extraction.text.Vectorizer`
@@ -100,7 +100,7 @@ zero features)::
   >>> vectors.nnz / vectors.shape[0]
   118
 
-``sklearn.datasets.fetch_20newsgroups_vectorized`` is a function which returns 
+``sklearn.datasets.fetch_20newsgroups_vectorized`` is a function which returns
 ready-to-use tfidf features instead of file names.
 
 .. _`20 newsgroups website`: http://people.csail.mit.edu/jrennie/20Newsgroups/
@@ -112,5 +112,3 @@ ready-to-use tfidf features instead of file names.
    * :ref:`example_grid_search_text_feature_extraction.py`
 
    * :ref:`example_document_classification_20newsgroups.py`
-
-
diff --git a/setup.cfg b/setup.cfg
@@ -4,6 +4,14 @@
 test = nosetests
 
 [nosetests]
+#with-coverage = 1
+cover-html = 1
+cover-html-dir = coverage
+cover-package = sklearn
+
 detailed-errors = 1
 with-doctest = 1
-cover-package = sklearn
+doctest-tests = 1
+doctest-extension = rst
+doctest-fixtures = _fixture
+doctest-options = +ELLIPSIS,+NORMALIZE_WHITESPACE

-Original file line number
+Diff line change
 --------
 :ref:`example_applications_face_recognition.py`
+-
+-