Merge pull request #5434 from jenshnielsen/nosetuptest

tacaswell · tacaswell · commit 4a705d1f6c17 · 2015-12-15T08:42:30.000-05:00
Remove setup.py tests and adapt docs to use tests.py conflicts in setup.py due to parts of #5604 being back-ported as well. Removed the windows bdist patch code to resolve.
diff --git a/setup.py b/setup.py
@@ -127,116 +127,13 @@
     ]
 
 
-class NoseTestCommand(TestCommand):
-    """Invoke unit tests using nose after an in-place build."""
-
-    description = "Invoke unit tests using nose after an in-place build."
-    user_options = [
-        ("pep8-only", None, "pep8 checks"),
-        ("omit-pep8", None, "Do not perform pep8 checks"),
-        ("nocapture", None, "do not capture stdout (nosetests)"),
-        ("nose-verbose", None, "be verbose (nosetests)"),
-        ("processes=", None, "number of processes (nosetests)"),
-        ("process-timeout=", None, "process timeout (nosetests)"),
-        ("with-coverage", None, "with coverage"),
-        ("detailed-error-msg", None, "detailed error message (nosetest)"),
-        ("tests=", None, "comma separated selection of tests (nosetest)"),
-    ]
-
-    def initialize_options(self):
-        self.pep8_only = None
-        self.omit_pep8 = None
-
-        # parameters passed to nose tests
-        self.processes = None
-        self.process_timeout = None
-        self.nose_verbose = None
-        self.nocapture = None
-        self.with_coverage = None
-        self.detailed_error_msg = None
-        self.tests = None
-
-    def finalize_options(self):
-        self.test_args = []
-        if self.pep8_only:
-            self.pep8_only = True
-        if self.omit_pep8:
-            self.omit_pep8 = True
-
-        if self.pep8_only and self.omit_pep8:
-            from distutils.errors import DistutilsOptionError
-            raise DistutilsOptionError(
-                "You are using several options for the test command in an "
-                "incompatible manner. Please use either --pep8-only or "
-                "--omit-pep8"
-            )
-
-        if self.processes:
-            self.test_args.append("--processes={prc}".format(
-                prc=self.processes))
-
-        if self.process_timeout:
-            self.test_args.append("--process-timeout={tout}".format(
-                tout=self.process_timeout))
-
-        if self.nose_verbose:
-            self.test_args.append("--verbose")
-
-        if self.nocapture:
-            self.test_args.append("--nocapture")
-
-        if self.with_coverage:
-            self.test_args.append("--with-coverage")
-
-        if self.detailed_error_msg:
-            self.test_args.append("-d")
-
-        if self.tests:
-            self.test_args.append("--tests={names}".format(names=self.tests))
-
+class NoopTestCommand(TestCommand):
     def run(self):
-        if self.distribution.install_requires:
-            self.distribution.fetch_build_eggs(
-                self.distribution.install_requires)
-        if self.distribution.tests_require:
-            self.distribution.fetch_build_eggs(self.distribution.tests_require)
-
-        self.announce('running unittests with nose')
-        self.with_project_on_sys_path(self.run_tests)
-
-    def run_tests(self):
-        import matplotlib
-        matplotlib.use('agg')
-        import nose
-        from matplotlib.testing.noseclasses import KnownFailure
-        from matplotlib import default_test_modules as testmodules
-        from matplotlib import font_manager
-        import time
-        # Make sure the font caches are created before starting any possibly
-        # parallel tests
-        if font_manager._fmcache is not None:
-            while not os.path.exists(font_manager._fmcache):
-                time.sleep(0.5)
-        plugins = [KnownFailure]
-
-        # Nose doesn't automatically instantiate all of the plugins in the
-        # child processes, so we have to provide the multiprocess plugin
-        # with a list.
-        from nose.plugins import multiprocess
-        multiprocess._instantiate_plugins = plugins
-
-        if self.omit_pep8:
-            testmodules.remove('matplotlib.tests.test_coding_standards')
-        elif self.pep8_only:
-            testmodules = ['matplotlib.tests.test_coding_standards']
-
-        nose.main(addplugins=[x() for x in plugins],
-                  defaultTest=testmodules,
-                  argv=['nosetests'] + self.test_args,
-                  exit=True)
+        print("Matplotlib does not support running tests with "
+              "'python setup.py test'. Please run 'python tests.py'")
 
 cmdclass = versioneer.get_cmdclass()
-cmdclass['test'] = NoseTestCommand
+cmdclass['test'] = NoopTestCommand
 
 # One doesn't normally see `if __name__ == '__main__'` blocks in a setup.py,
 # however, this is needed on Windows to avoid creating infinite subprocesses
@@ -252,7 +149,6 @@ def run_tests(self):
     package_dir = {'': 'lib'}
     install_requires = []
     setup_requires = []
-    tests_require = []
     default_backend = None
 
     # Go through all of the packages and figure out which ones we are
@@ -313,7 +209,6 @@ def run_tests(self):
             package_data[key] = list(set(val + package_data[key]))
         install_requires.extend(package.get_install_requires())
         setup_requires.extend(package.get_setup_requires())
-        tests_require.extend(package.get_tests_require())
 
     # Write the default matplotlibrc file
     if default_backend is None:
@@ -373,7 +268,6 @@ def run_tests(self):
         # List third-party Python packages that we require
         install_requires=install_requires,
         setup_requires=setup_requires,
-        tests_require=tests_require,
 
         # matplotlib has C/C++ extensions, so it's not zip safe.
         # Telling setuptools this prevents it from doing an automatic
diff --git a/setupext.py b/setupext.py
@@ -426,12 +426,6 @@ def get_setup_requires(self):
         """
         return []
 
-    def get_tests_require(self):
-        """
-        Get a list of Python packages that we require for executing tests.
-        """
-        return []
-
     def _check_for_pkg_config(self, package, include_file, min_version=None,
                               version=None):
         """
@@ -664,8 +658,8 @@ def check(self):
 
         msgs = []
         msg_template = ('{package} is required to run the matplotlib test '
-                        'suite. "setup.py test" will automatically download it.'
-                        ' Install {package} to run matplotlib.test()')
+                        'suite. Please install it with pip or your preferred'
+                        ' tool to run the test suite')
 
         bad_nose = msg_template.format(
             package='nose %s or later' % self.nose_min_version
@@ -713,12 +707,6 @@ def get_package_data(self):
                 'sphinxext/tests/tinypages/_static/*',
             ]}
 
-    def get_tests_require(self):
-        requires = ['nose>=%s' % self.nose_min_version, 'sphinx']
-        if not sys.version_info >= (3, 3):
-            requires += ['mock']
-        return requires
-
 
 class Toolkits_Tests(Tests):
     name = "toolkits_tests"
