Merge branch 'main' into rm-3.7

hugovk · web-flow · commit 720adbdc62ae · 2024-01-15T00:02:25.000+02:00
diff --git a/docs/html/development/ci.rst b/docs/html/development/ci.rst
@@ -22,6 +22,7 @@ pip support a variety of Python interpreters:
 - CPython 3.9
 - CPython 3.10
 - CPython 3.11
+- CPython 3.12
 - Latest PyPy3
 
 on different operating systems:
@@ -96,6 +97,8 @@ Actual testing
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.11|               |                 |
 |           |          +-------+---------------+-----------------+
+|           |          | CP3.12|               |                 |
+|           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 |  Windows  +----------+-------+---------------+-----------------+
 |           |   x64    | CP3.8 |   GitHub      |   GitHub        |
@@ -106,6 +109,8 @@ Actual testing
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.11|   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
+|           |          | CP3.12|               |                 |
+|           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 +-----------+----------+-------+---------------+-----------------+
 |           |   x86    | CP3.8 |               |                 |
@@ -116,6 +121,8 @@ Actual testing
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.11|               |                 |
 |           |          +-------+---------------+-----------------+
+|           |          | CP3.12|               |                 |
+|           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 |   Linux   +----------+-------+---------------+-----------------+
 |           |   x64    | CP3.8 |   GitHub      |   GitHub        |
@@ -126,6 +133,8 @@ Actual testing
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.11|   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
+|           |          | CP3.12|   GitHub      |   GitHub        |
+|           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 +-----------+----------+-------+---------------+-----------------+
 |           |  arm64   | CP3.8 |               |                 |
@@ -136,6 +145,8 @@ Actual testing
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.11|               |                 |
 |           |          +-------+---------------+-----------------+
+|           |          | CP3.12|               |                 |
+|           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 |   macOS   +----------+-------+---------------+-----------------+
 |           |   x64    | CP3.8 |   GitHub      |   GitHub        |
@@ -146,5 +157,7 @@ Actual testing
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.11|   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
+|           |          | CP3.12|   GitHub      |   GitHub        |
+|           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 +-----------+----------+-------+---------------+-----------------+
diff --git a/docs/html/reference/build-system/pyproject-toml.md b/docs/html/reference/build-system/pyproject-toml.md
@@ -135,13 +135,13 @@ section, it will be assumed to have the following backend settings:
 
 ```toml
 [build-system]
-requires = ["setuptools>=40.8.0", "wheel"]
+requires = ["setuptools>=40.8.0"]
 build-backend = "setuptools.build_meta:__legacy__"
 ```
 
 If a project has a `build-system` section but no `build-backend`, then:
 
-- It is expected to include `setuptools` and `wheel` as build requirements. An
+- It is expected to include `setuptools` as a build requirement. An
   error is reported if the available version of `setuptools` is not recent
   enough.
 
diff --git a/news/12449.bugfix.rst b/news/12449.bugfix.rst
@@ -0,0 +1,2 @@
+Removed ``wheel`` from the ``[build-system].requires`` list fallback
+that is used when ``pyproject.toml`` is absent.
diff --git a/news/12449.doc.rst b/news/12449.doc.rst
@@ -0,0 +1,2 @@
+Updated the ``pyproject.toml`` document to stop suggesting
+to depend on ``wheel`` as a build dependency directly.
diff --git a/news/12475.doc.rst b/news/12475.doc.rst
@@ -0,0 +1 @@
+Update supported interpreters in development docs
diff --git a/src/pip/_internal/pyproject.py b/src/pip/_internal/pyproject.py
@@ -123,7 +123,7 @@ def load_pyproject_toml(
         # a version of setuptools that supports that backend.
 
         build_system = {
-            "requires": ["setuptools>=40.8.0", "wheel"],
+            "requires": ["setuptools>=40.8.0"],
             "build-backend": "setuptools.build_meta:__legacy__",
         }
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Removed ``wheel`` from the ``[build-system].requires`` list fallback
	`2`	+that is used when ``pyproject.toml`` is absent.
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Updated the ``pyproject.toml`` document to stop suggesting
	`2`	+to depend on ``wheel`` as a build dependency directly.
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Update supported interpreters in development docs`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ def load_pyproject_toml(`
`123`	`123`	`# a version of setuptools that supports that backend.`
`124`	`124`
`125`	`125`	`build_system = {`
`126`		`- "requires": ["setuptools>=40.8.0", "wheel"],`
	`126`	`+ "requires": ["setuptools>=40.8.0"],`
`127`	`127`	`"build-backend": "setuptools.build_meta:__legacy__",`
`128`	`128`	`}`
`129`	`129`