Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove setuptools support #11363

Merged
merged 4 commits into from Apr 27, 2023
Merged

Remove setuptools support #11363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
078e194
Remove setuptools support
AA-Turner Apr 24, 2023
875562d
CHANGES
AA-Turner Apr 26, 2023
1585417
rm setuptools
AA-Turner Apr 26, 2023
0a6e941
Merge branch 'master' into 7.0-removals/setuptools
AA-Turner Apr 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES
View file
Open in desktop
Expand Up @@ -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
----------
Expand Down
3 changes: 0 additions & 3 deletions doc/conf.py
View file
Open in desktop
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion doc/extdev/deprecated.rst
View file
Open in desktop
Expand Up @@ -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
Expand Down
200 changes: 0 additions & 200 deletions doc/usage/advanced/setuptools.rst
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion doc/usage/index.rst
View file
Open in desktop
Expand Up @@ -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
1 change: 0 additions & 1 deletion doc/usage/quickstart.rst
View file
Open in desktop
Expand Up @@ -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>`
Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
View file
Open in desktop
Expand Up @@ -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",
Expand Down