Merge pull request scikit-learn#6274 from jakevdp/setup_py_fix

[MRG+1] MAINT: Make sure all tests are included with installation

Author: GaelVaroquaux

sklearn/cluster/setup.py

@@ -45,6 +45,8 @@ def configuration(parent_package='', top_path=None):
         **blas_info
     )
 
+    config.add_subpackage('tests')
+
     return config
 
 if __name__ == '__main__':

sklearn/cross_decomposition/tests/__init__.py

@@ -13,7 +13,7 @@ def configuration(parent_package='', top_path=None):
     config.add_extension('_svmlight_format',
                          sources=['_svmlight_format.c'],
                          include_dirs=[numpy.get_include()])
-
+    config.add_subpackage('tests')
     return config
 
 

sklearn/datasets/setup.py

@@ -14,5 +14,6 @@ def configuration(parent_package='', top_path=None):
                          sources=['_hashing.c'],
                          include_dirs=[numpy.get_include()],
                          libraries=libraries)
+    config.add_subpackage("tests")
 
     return config

sklearn/feature_extraction/setup.py

@@ -27,6 +27,8 @@ def configuration(parent_package="", top_path=None):
                                        blas_info.pop('include_dirs', [])],
                          extra_compile_args=eca, **blas_info)
 
+    config.add_subpackage('tests')
+
     return config
 
 if __name__ == "__main__":

sklearn/manifold/setup.py

@@ -23,6 +23,7 @@ def configuration(parent_package="", top_path=None):
                          extra_compile_args=blas_info.pop('extra_compile_args',
                                                           []),
                          **blas_info)
+    config.add_subpackage('tests')
 
     return config
 

sklearn/manifold/tests/__init__.py

@@ -57,7 +57,7 @@
 from sklearn.datasets import make_classification
 from sklearn.datasets import make_multilabel_classification
 
-from test_split import MockClassifier
+from sklearn.model_selection.tests.test_split import MockClassifier
 
 
 class MockImprovingEstimator(BaseEstimator):

sklearn/metrics/setup.py

@@ -32,4 +32,6 @@ def configuration(parent_package='', top_path=None):
                          include_dirs=[numpy.get_include()],
                          libraries=libraries)
 
+    config.add_subpackage('tests')
+
     return config