From de6b18ac7de317030be4344ea7a9d553c423ffcf Mon Sep 17 00:00:00 2001
From: Willem <14mRh4X0r@gmail.com>
Date: Fri, 12 May 2023 23:46:17 +0200
Subject: Remove remaining references to the setuptools integration (#11418)

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
---
 CHANGES        | 4 ++++
 pyproject.toml | 5 -----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 631ec3b7b..2ece2cac6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,6 +20,10 @@ Features added
 Bugs fixed
 ----------
 
+* #11418: Clean up remaining references to ``sphinx.setup_command``
+  following the removal of support for setuptools.
+  Patch by Willem Mulder.
+
 Testing
 --------
 
diff --git a/pyproject.toml b/pyproject.toml
index 7b48d4efe..cd21fb6bc 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"]
 
-- 
cgit v1.2.1


From d48cc783b6e48b99cbbcf5462f44c59a4ed78e6a Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
Date: Fri, 12 May 2023 22:48:41 +0100
Subject: Bump to 7.0.1 final

---
 CHANGES            | 16 ++--------------
 sphinx/__init__.py |  4 ++--
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/CHANGES b/CHANGES
index 2ece2cac6..06c31b9c8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,5 @@
-Release 7.0.1 (in development)
-==============================
+Release 7.0.1 (released May 12, 2023)
+=====================================
 
 Dependencies
 ------------
@@ -8,15 +8,6 @@ Dependencies
 
 .. _Docutils 0.20: https://docutils.sourceforge.io/RELEASE-NOTES.html#release-0-20-2023-05-04
 
-Incompatible changes
---------------------
-
-Deprecated
-----------
-
-Features added
---------------
-
 Bugs fixed
 ----------
 
@@ -24,9 +15,6 @@ Bugs fixed
   following the removal of support for setuptools.
   Patch by Willem Mulder.
 
-Testing
---------
-
 Release 7.0.0 (released Apr 29, 2023)
 =====================================
 
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index 5af167f10..2391eb240 100644
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -30,11 +30,11 @@ __display_version__ = __version__  # used for command line version
 #:
 #: .. versionadded:: 1.2
 #:    Before version 1.2, check the string ``sphinx.__version__``.
-version_info = (7, 0, 1, 'beta', 0)
+version_info = (7, 0, 1, 'final', 0)
 
 package_dir = path.abspath(path.dirname(__file__))
 
-_in_development = True
+_in_development = False
 if _in_development:
     # Only import subprocess if needed
     import subprocess
-- 
cgit v1.2.1