Merge pull request #361 from jelmer/drop-testcommand

Drop TestCommand

NEWS

@@ -3,7 +3,7 @@ testtools NEWS
 
 Changes and improvements to testtools_, grouped by release.
 
-2.6.1
+2.7.0
 ~~~~~
 
 Improvements
@@ -15,6 +15,9 @@ Improvements
 * Add typing in various modules (still lacking full coverage).
   (Jelmer Vernooij)
 
+* Drop the 'test' command for distutils. This has been
+  deprecated since 2.6.0. (Jelmer Vernooij)
+
 2.6.0
 ~~~~~
 

doc/for-test-authors.rst

@@ -88,43 +88,6 @@ of them will happily run testtools tests.  In particular:
 
 From now on, we'll assume that you know how to run your tests.
 
-Running test with Distutils
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. deprecated:: 2.6.0
-
-    Distutils integration was deprecated in 2.6.0. You should consider
-    replacing invocations of ``python setup.py test`` with a suitable
-    alternative such as ``tox``. Refer to `this issue`__ for more information.
-
-    .. __: https://github.com/pypa/setuptools/issues/1684
-
-If you are using Distutils_ to build your Python project, you can use the testtools
-Distutils_ command to integrate testtools into your Distutils_ workflow::
-
-  from distutils.core import setup
-  from testtools import TestCommand
-  setup(name='foo',
-      version='1.0',
-      py_modules=['foo'],
-      cmdclass={'test': TestCommand}
-  )
-
-You can then run::
-
-  $ python setup.py test -m exampletest
-  Tests running...
-  Ran 2 tests in 0.000s
-
-  OK
-
-For more information about the capabilities of the `TestCommand` command see::
-
-	$ python setup.py test --help
-
-You can use the `setup configuration`_ to specify the default behavior of the
-`TestCommand` command.
-
 Assertions
 ==========
 
@@ -1469,6 +1432,4 @@ Here, ``repr(nullary)`` will be the same as ``repr(f)``.
 .. _doctest: http://docs.python.org/library/doctest.html
 .. _Deferred: http://twistedmatrix.com/documents/current/core/howto/defer.html
 .. _discover: http://pypi.python.org/pypi/discover
-.. _Distutils: http://docs.python.org/library/distutils.html
-.. _`setup configuration`: http://docs.python.org/distutils/configfile.html
 .. _broken: http://chipaca.com/post/3210673069/hasattr-17-less-harmful

setup.py

@@ -1,17 +1,7 @@
 #!/usr/bin/env python
 import setuptools
 
-try:
-    import testtools
-    cmd_class = {}
-    if getattr(testtools, 'TestCommand', None) is not None:
-        cmd_class['test'] = testtools.TestCommand
-except:
-    cmd_class = None
-
-
 setuptools.setup(
     python_requires='>=3.6',
-    cmdclass=cmd_class,
     setup_requires=['pbr'],
     pbr=True)

testtools/__init__.py

@@ -21,7 +21,6 @@
     'ResourcedToStreamDecorator',
     'Tagger',
     'TestCase',
-    'TestCommand',
     'TestByTestResult',
     'TestResult',
     'TestResultDecorator',
@@ -96,7 +95,6 @@
     FixtureSuite,
     iterate_tests,
 )
-from testtools.distutilscmd import TestCommand
 
 # same format as sys.version_info: "A tuple containing the five components of
 # the version number: major, minor, micro, releaselevel, and serial. All

testtools/tests/__init__.py

@@ -15,7 +15,6 @@ def test_suite():
         test_compat,
         test_content,
         test_content_type,
-        test_distutilscmd,
         test_fixturesupport,
         test_helpers,
         test_monkey,
@@ -34,7 +33,6 @@ def test_suite():
         test_compat,
         test_content,
         test_content_type,
-        test_distutilscmd,
         test_fixturesupport,
         test_helpers,
         test_monkey,