Merge pull request #192 from cjwatson/remove-eggsupport

Remove ftest command and zope.testrunner.eggsupport
zopefoundation · Feb 11, 2025 · 1f2c4f3 · 1f2c4f3
2 parents 21dccee + ffb3311
commit 1f2c4f3
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 307 deletions.
diff --git a/.meta.toml b/.meta.toml
@@ -13,7 +13,7 @@ with-future-python = false
 with-macos = false
 
 [coverage]
-fail-under = 82.5
+fail-under = 84.4
 
 [manifest]
 additional-rules = [

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,10 +2,18 @@
  zope.testrunner Changelog
 ===========================
 
-6.8 (unreleased)
+7.0 (unreleased)
 ================
 
-- Nothing changed yet.
+Backwards-incompatible changes
+------------------------------
+
+- Remove ``setup.py ftest`` command.
+  (`#178 <https://github.com/zopefoundation/zope.testrunner/issues/178>`_)
+
+- Remove ``zope.testrunner.eggsupport``.  It is no longer usable as of
+  ``setuptools`` 72.0.0.
+  (`#185 <https://github.com/zopefoundation/zope.testrunner/issues/185>`_)
 
 
 6.7 (2025-02-07)

diff --git a/docs/api.rst b/docs/api.rst
@@ -5,5 +5,3 @@
 .. automodule:: zope.testrunner
 
 .. autoclass:: zope.testrunner.runner.Runner
-
-.. automodule:: zope.testrunner.eggsupport
diff --git a/docs/index.rst b/docs/index.rst
@@ -80,7 +80,6 @@ To get started testing right away, see :doc:`getting-started`
 
    testrunner-simple
    testrunner-arguments
-   testrunner-eggsupport
    api
 
 

diff --git a/docs/testrunner-eggsupport.rst b/docs/testrunner-eggsupport.rst
diff --git a/pyproject.toml b/pyproject.toml
@@ -11,7 +11,7 @@ branch = true
 source = ["zope.testrunner"]
 
 [tool.coverage.report]
-fail_under = 82.5
+fail_under = 84.4
 precision = 2
 ignore_errors = true
 show_missing = true

diff --git a/setup.py b/setup.py
@@ -99,8 +99,6 @@ def read(*names):
     entry_points={
         'console_scripts':
             ['zope-testrunner = zope.testrunner:run'],
-        'distutils.commands': [
-            'ftest = zope.testrunner.eggsupport:ftest'],
     },
     include_package_data=True,
     zip_safe=False,

diff --git a/src/zope/testrunner/eggsupport.py b/src/zope/testrunner/eggsupport.py
diff --git a/src/zope/testrunner/tests/test_doctest.py b/src/zope/testrunner/tests/test_doctest.py
@@ -248,19 +248,6 @@ def test_suite():
         doctest.DocTestSuite('zope.testrunner.find'),
     ]
 
-    try:
-        from setuptools.command.test import ScanningLoader  # noqa: F401
-    except ImportError:
-        # modern ``setuptools`` without ``test`` support
-        pass
-    else:
-        suites.append(
-            doctest.DocFileSuite(
-                'testrunner-eggsupport.rst',
-                setUp=setUp, tearDown=tearDown,
-                optionflags=optionflags,
-                checker=checker))
-
     # PyPy uses a different garbage collector
     if hasattr(gc, 'get_threshold'):
         suites.append(

diff --git a/src/zope/testrunner/tests/testrunner-eggsupport.rst b/src/zope/testrunner/tests/testrunner-eggsupport.rst
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,5 +5,3 @@
		.. automodule:: zope.testrunner

		.. autoclass:: zope.testrunner.runner.Runner

		.. automodule:: zope.testrunner.eggsupport
-Original file line number
+Diff line change
@@ Expand Up / @@ -80,7 +80,6 @@ To get started testing right away, see :doc:`getting-started` @@
        testrunner-simple
        testrunner-arguments
-       testrunner-eggsupport
        api
@@ Expand Down @@