From 8f49254775ce53d26fc419b8b1b11b8404657228 Mon Sep 17 00:00:00 2001 From: Willem Mulder Date: Fri, 12 May 2023 11:19:27 +0200 Subject: [PATCH 1/2] Remove setup_command from pyproject.toml (#11418) --- CHANGES | 3 +++ pyproject.toml | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 631ec3b7b00..c07f7543413 100644 --- a/CHANGES +++ b/CHANGES @@ -20,6 +20,9 @@ Features added Bugs fixed ---------- +* #11418: Remove distutils entry point and any other references to + ``setup_command`` from pyproject.toml + Testing -------- diff --git a/pyproject.toml b/pyproject.toml index 7b48d4efea9..cd21fb6bc68 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -105,9 +105,6 @@ sphinx-quickstart = "sphinx.cmd.quickstart:main" sphinx-apidoc = "sphinx.ext.apidoc:main" sphinx-autogen = "sphinx.ext.autosummary.generate:main" -[project.entry-points."distutils.commands"] -build_sphinx = 'sphinx.setup_command:BuildDoc' - [tool.flit.module] name = "sphinx" @@ -344,7 +341,6 @@ module = [ "sphinx.ext.napoleon.docstring", "sphinx.pycode.parser", "sphinx.registry", - "sphinx.setup_command", "sphinx.testing.util", "sphinx.transforms.i18n", "sphinx.transforms.post_transforms.images", @@ -391,7 +387,6 @@ filterwarnings = [ ] markers = [ "apidoc", - "setup_command", ] testpaths = ["tests"] From 666c897ad149e52d9aef080b5ac85ad8bacb0536 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+AA-Turner@users.noreply.github.com> Date: Fri, 12 May 2023 13:53:23 +0100 Subject: [PATCH 2/2] Update note in CHANGES --- CHANGES | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index c07f7543413..2ece2cac673 100644 --- a/CHANGES +++ b/CHANGES @@ -20,8 +20,9 @@ Features added Bugs fixed ---------- -* #11418: Remove distutils entry point and any other references to - ``setup_command`` from pyproject.toml +* #11418: Clean up remaining references to ``sphinx.setup_command`` + following the removal of support for setuptools. + Patch by Willem Mulder. Testing --------