Merge branch 'main' into fix/3777

di · web-flow · commit 8ba79d9db45b · 2025-01-27T11:37:28.000-05:00
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -5,6 +5,9 @@ python:
     extra_requirements:
       - doc
 
+sphinx:
+  configuration: docs/conf.py
+
 # required boilerplate readthedocs/readthedocs.org#10401
 build:
   os: ubuntu-lts-latest
diff --git a/newsfragments/4809.bugfix.rst b/newsfragments/4809.bugfix.rst
@@ -0,0 +1,2 @@
+Fixed crash generating error message printed when building wheels for the
+free-threaded build using the limited API. -- by :user:`ngoldbaum`
diff --git a/setuptools/command/bdist_wheel.py b/setuptools/command/bdist_wheel.py
@@ -284,7 +284,7 @@ def _validate_py_limited_api(self) -> None:
             raise ValueError(
                 f"`py_limited_api={self.py_limited_api!r}` not supported. "
                 "`Py_LIMITED_API` is currently incompatible with "
-                f"`Py_GIL_DISABLED` ({sys.abiflags=!r}). "
+                "`Py_GIL_DISABLED`."
                 "See https://github.com/python/cpython/issues/111506."
             )
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fixed crash generating error message printed when building wheels for the`
	`2`	+free-threaded build using the limited API. -- by :user:`ngoldbaum`
Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ def _validate_py_limited_api(self) -> None:`
`284`	`284`	`raise ValueError(`
`285`	`285`	f"`py_limited_api={self.py_limited_api!r}` not supported. "
`286`	`286`	"`Py_LIMITED_API` is currently incompatible with "
`287`		- f"`Py_GIL_DISABLED` ({sys.abiflags=!r}). "
	`287`	+ "`Py_GIL_DISABLED`."
`288`	`288`	`"See https://github.com/python/cpython/issues/111506."`
`289`	`289`	`)`
`290`	`290`