Merge branch 'master' into fix-3.11

Author: jelmer

NEWS

@@ -12,6 +12,9 @@ Improvements
 * Add support for Python 3.10.
   (Jürgen Gmach)
 
+* Distutils integration is deprecated and will be removed in the next major
+  version.
+
 2.5.0
 ~~~~~
 
@@ -39,7 +42,7 @@ Changes
 
 * The ``safe_hasattr`` utility has been removed from ``testtools.helpers``.
   This was a compat wrapper introduced in 0.9.25 when the utility itself was
-  moved to the ``extras`` package. It is no longer useless on Python 3-only
+  moved to the ``extras`` package. It is no longer used on Python 3-only
   projects.
 
 * The ``try_imports`` utility has been removed from ``testtools.helpers``.

doc/for-test-authors.rst

@@ -92,6 +92,14 @@ 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::
 

doc/overview.rst

@@ -38,14 +38,6 @@ What better way to start than with a contrived code snippet?::
 Why use testtools?
 ==================
 
-Better assertion methods
-------------------------
-
-The standard assertion methods that come with unittest aren't as helpful as
-they could be, and there aren't quite enough of them.  testtools adds
-``assertIn``, ``assertIs``, ``assertIsInstance`` and their negatives.
-
-
 Matchers: better than assertion methods
 ---------------------------------------
 

testtools/distutilscmd.py

@@ -3,6 +3,7 @@
 """Extensions to the standard Python unittest library."""
 
 import sys
+import warnings
 
 from distutils.core import Command
 from distutils.errors import DistutilsOptionError
@@ -19,15 +20,22 @@ class TestCommand(Command):
         ('catch', 'c', "Catch ctrl-C and display results so far"),
         ('buffer', 'b', "Buffer stdout and stderr during tests"),
         ('failfast', 'f', "Stop on first fail or error"),
-        ('test-module=','m', "Run 'test_suite' in specified module"),
-        ('test-suite=','s',
+        ('test-module=', 'm', "Run 'test_suite' in specified module"),
+        ('test-suite=', 's',
          "Test suite to run (e.g. 'some_module.test_suite')")
     ]
 
     def __init__(self, dist):
         Command.__init__(self, dist)
         self.runner = TestToolsTestRunner(stdout=sys.stdout)
 
+        warnings.warn(
+            "Distutils integration is deprecated and will be removed in the "
+            "next major release. "
+            "Refer to https://github.com/pypa/setuptools/issues/1684 for more "
+            "information.",
+            DeprecationWarning,
+        )
 
     def initialize_options(self):
         self.test_suite = None