Remove the deprecated Setuptools integration (#11363)

sphinx-doc · Apr 27, 2023 · 2a9e805 · 2a9e805
1 parent 616ba29
commit 2a9e805
Show file tree

Hide file tree

Showing 11 changed files with 3 additions and 402 deletions.
diff --git a/CHANGES b/CHANGES
@@ -11,6 +11,8 @@ Incompatible changes
   ``DefaultSplitter`` in ``sphinx.search.ja``.
 * #11360: Remove deprecated ``make_old_id`` functions in domain object
   description classes.
+* #11363: Remove the Setuptools integration (``build_sphinx`` hook in
+  ``setup.py``).
 
 Deprecated
 ----------

diff --git a/doc/conf.py b/doc/conf.py
@@ -231,9 +231,6 @@ def setup(app):
     app.add_object_type('confval', 'confval',
                         objname='configuration value',
                         indextemplate='pair: %s; configuration value')
-    app.add_object_type('setuptools-confval', 'setuptools-confval',
-                        objname='setuptools configuration value',
-                        indextemplate='pair: %s; setuptools configuration value')
     fdesc = GroupedField('parameter', label='Parameters',
                          names=['param'], can_collapse=True)
     app.add_object_type('event', 'event', 'pair: %s; event', parse_event,

diff --git a/doc/extdev/deprecated.rst b/doc/extdev/deprecated.rst
@@ -102,7 +102,7 @@ The following is a list of deprecated interfaces.
      - 7.0
      - The standard library ``json`` module.
 
-   * - :doc:`Setuptools integration </usage/advanced/setuptools>`
+   * - The Setuptools integration (``setup.py build_sphinx``)
      - 5.0
      - 7.0
      - N/A

diff --git a/doc/usage/advanced/setuptools.rst b/doc/usage/advanced/setuptools.rst
diff --git a/doc/usage/index.rst b/doc/usage/index.rst
@@ -17,5 +17,4 @@ looking for guidance on extending Sphinx, refer to :doc:`/development/index`.
    extensions/index
    theming
    advanced/intl
-   advanced/setuptools
    advanced/websupport/index
diff --git a/doc/usage/quickstart.rst b/doc/usage/quickstart.rst
@@ -332,7 +332,6 @@ More topics to be covered
 - :doc:`Other extensions </usage/extensions/index>`:
 - Static files
 - :doc:`Selecting a theme </usage/theming>`
-- :doc:`/usage/advanced/setuptools`
 - :ref:`Templating <templating>`
 - Using extensions
 - :ref:`Writing extensions <dev-extensions>`

diff --git a/pyproject.toml b/pyproject.toml
@@ -36,7 +36,6 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
-    "Framework :: Setuptools Plugin",
     "Framework :: Sphinx",
     "Framework :: Sphinx :: Extension",
     "Framework :: Sphinx :: Theme",