Merge branch '5.1.x' into 5.x

# Conflicts:
#	CHANGES
#	sphinx/__init__.py

CHANGES

@@ -22,6 +22,37 @@ Bugs fixed
 Testing
 --------
 
+Release 5.1.2 (in development)
+==============================
+
+Dependencies
+------------
+
+Incompatible changes
+--------------------
+
+Deprecated
+----------
+
+Features added
+--------------
+
+Bugs fixed
+----------
+
+Testing
+--------
+
+Release 5.1.1 (released Jul 26, 2022)
+=====================================
+
+Bugs fixed
+----------
+
+* #10701: Fix ValueError in the new ``deque`` based ``sphinx.ext.napolean``
+  iterator implementation.
+* #10702: Restore compatability with third-party builders.
+
 Release 5.1.0 (released Jul 24, 2022)
 =====================================
 

sphinx/builders/__init__.py

@@ -89,10 +89,11 @@ class Builder:
             self.env: BuildEnvironment = env
             self.env.set_versioning_method(self.versioning_method,
                                            self.versioning_compare)
-        elif env is not Ellipsis:
+        else:
             # ... is passed by SphinxComponentRegistry.create_builder to not show two warnings.
             warnings.warn("The 'env' argument to Builder will be required from Sphinx 7.",
                           RemovedInSphinx70Warning, stacklevel=2)
+            self.env = None
         self.events: EventManager = app.events
         self.config: Config = app.config
         self.tags: Tags = app.tags

sphinx/registry.py

@@ -166,7 +166,7 @@ class SphinxComponentRegistry:
                 f"'env'argument. Report this bug to the developers of your custom builder, "
                 f"this is likely not a issue with Sphinx. The 'env' argument will be required "
                 f"from Sphinx 7.", RemovedInSphinx70Warning, stacklevel=2)
-            builder = self.builders[name](app, env=...)  # type: ignore[arg-type]
+            builder = self.builders[name](app)
             if env is not None:
                 builder.set_environment(env)
             return builder