forked from pool/python313
Compare commits
64 Commits
slfo-main-
...
factory
| Author | SHA256 | Date | |
|---|---|---|---|
| 8490c35b5e | |||
| 216aee44d2 | |||
| 5c7e077e05 | |||
| 6ccfd57cb6 | |||
| f26b5dd668 | |||
| 97f2e50954 | |||
| d782ad00ca | |||
| b40f1d6405 | |||
| 45ae9e0091 | |||
| 0f5697e310 | |||
| f819c56b57 | |||
| 6ca12749fe | |||
| af83d0ea02 | |||
| 588cd5ec7f | |||
| 4a974dadae | |||
| 9a64481749 | |||
| 0c1f23a3d6 | |||
| 00d0af4ebb | |||
| 8fc89fce82 | |||
| 5584dde572 | |||
| b30cd19ff8 | |||
| cb554c7d4c | |||
| 92106b1aea | |||
| cf3b0e517c | |||
| f3df88065e | |||
| 7d8817d9bb | |||
| 308dfaef9b | |||
| c2d30804e6 | |||
| 70558652fc | |||
| 6072bbdbcd | |||
| f5a88d357f | |||
| 6d5d3f96b0 | |||
| 820434f8e4 | |||
| 487ae82f04 | |||
| 55fb9cd905 | |||
| d8af743464 | |||
| c1d8c54913 | |||
| bb17c93a2a | |||
| 55167f91bd | |||
| b91bbdde1b | |||
| 384d0f4194 | |||
| 9e2287fa69 | |||
| 9624a1ae7e | |||
| 415df5f3cd | |||
| 3467717953 | |||
| 1ea8708b8d | |||
| 279fe75cee | |||
| 7d140c532a | |||
| 5c3c7cecd2 | |||
| 528339bd34 | |||
| adc199414a | |||
| 183fa1a4f9 | |||
| d67c636211 | |||
| 73ac4a887b | |||
| eb20745074 | |||
| d24d58c01e | |||
| 26d0509456 | |||
| 3029e09e6c | |||
| 5ddcd862f2 | |||
| 30eeed452e | |||
| 3827c5d408 | |||
| 2325ab9130 | |||
| da884a6e9b | |||
| 45a1da448a |
@@ -28,9 +28,11 @@ Co-authored-by: Lumír Balhar <frenzy.madness@gmail.com>
|
||||
Lib/test/test_sysconfig.py | 17 +++++++++++--
|
||||
2 files changed, 67 insertions(+), 7 deletions(-)
|
||||
|
||||
--- a/Lib/sysconfig/__init__.py
|
||||
+++ b/Lib/sysconfig/__init__.py
|
||||
@@ -106,6 +106,11 @@ if os.name == 'nt':
|
||||
Index: Python-3.13.3/Lib/sysconfig/__init__.py
|
||||
===================================================================
|
||||
--- Python-3.13.3.orig/Lib/sysconfig/__init__.py 2025-04-08 15:54:08.000000000 +0200
|
||||
+++ Python-3.13.3/Lib/sysconfig/__init__.py 2025-04-11 21:52:31.769387873 +0200
|
||||
@@ -106,6 +106,11 @@
|
||||
else:
|
||||
_INSTALL_SCHEMES['venv'] = _INSTALL_SCHEMES['posix_venv']
|
||||
|
||||
@@ -42,7 +44,7 @@ Co-authored-by: Lumír Balhar <frenzy.madness@gmail.com>
|
||||
def _get_implementation():
|
||||
return 'Python'
|
||||
|
||||
@@ -167,13 +172,28 @@ if _HAS_USER_BASE:
|
||||
@@ -167,13 +172,28 @@
|
||||
},
|
||||
}
|
||||
|
||||
@@ -71,7 +73,7 @@ Co-authored-by: Lumír Balhar <frenzy.madness@gmail.com>
|
||||
_BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix)
|
||||
# Mutex guarding initialization of _CONFIG_VARS.
|
||||
_CONFIG_VARS_LOCK = threading.RLock()
|
||||
@@ -259,11 +279,40 @@ def _extend_dict(target_dict, other_dict
|
||||
@@ -266,11 +286,40 @@
|
||||
target_dict[key] = value
|
||||
|
||||
|
||||
@@ -113,7 +115,7 @@ Co-authored-by: Lumír Balhar <frenzy.madness@gmail.com>
|
||||
if os.name == 'nt':
|
||||
# On Windows we want to substitute 'lib' for schemes rather
|
||||
# than the native value (without modifying vars, in case it
|
||||
@@ -464,10 +513,8 @@ def _init_config_vars():
|
||||
@@ -471,10 +520,8 @@
|
||||
# Normalized versions of prefix and exec_prefix are handy to have;
|
||||
# in fact, these are the standard versions used most places in the
|
||||
# Distutils.
|
||||
@@ -126,9 +128,11 @@ Co-authored-by: Lumír Balhar <frenzy.madness@gmail.com>
|
||||
_CONFIG_VARS['py_version'] = _PY_VERSION
|
||||
_CONFIG_VARS['py_version_short'] = _PY_VERSION_SHORT
|
||||
_CONFIG_VARS['py_version_nodot'] = _PY_VERSION_SHORT_NO_DOT
|
||||
--- a/Lib/test/test_sysconfig.py
|
||||
+++ b/Lib/test/test_sysconfig.py
|
||||
@@ -130,8 +130,19 @@ class TestSysConfig(unittest.TestCase):
|
||||
Index: Python-3.13.3/Lib/test/test_sysconfig.py
|
||||
===================================================================
|
||||
--- Python-3.13.3.orig/Lib/test/test_sysconfig.py 2025-04-08 15:54:08.000000000 +0200
|
||||
+++ Python-3.13.3/Lib/test/test_sysconfig.py 2025-04-11 21:52:31.769841915 +0200
|
||||
@@ -130,8 +130,19 @@
|
||||
for scheme in _INSTALL_SCHEMES:
|
||||
for name in _INSTALL_SCHEMES[scheme]:
|
||||
expected = _INSTALL_SCHEMES[scheme][name].format(**config_vars)
|
||||
@@ -149,7 +153,7 @@ Co-authored-by: Lumír Balhar <frenzy.madness@gmail.com>
|
||||
os.path.normpath(expected),
|
||||
)
|
||||
|
||||
@@ -386,7 +397,7 @@ class TestSysConfig(unittest.TestCase):
|
||||
@@ -386,7 +397,7 @@
|
||||
self.assertTrue(os.path.isfile(config_h), config_h)
|
||||
|
||||
def test_get_scheme_names(self):
|
||||
@@ -158,7 +162,7 @@ Co-authored-by: Lumír Balhar <frenzy.madness@gmail.com>
|
||||
if HAS_USER_BASE:
|
||||
wanted.extend(['nt_user', 'osx_framework_user', 'posix_user'])
|
||||
self.assertEqual(get_scheme_names(), tuple(sorted(wanted)))
|
||||
@@ -398,6 +409,8 @@ class TestSysConfig(unittest.TestCase):
|
||||
@@ -398,6 +409,8 @@
|
||||
cmd = "-c", "import sysconfig; print(sysconfig.get_platform())"
|
||||
self.assertEqual(py.call_real(*cmd), py.call_link(*cmd))
|
||||
|
||||
|
||||
BIN
Python-3.13.2.tar.xz
(Stored with Git LFS)
BIN
Python-3.13.2.tar.xz
(Stored with Git LFS)
Binary file not shown.
File diff suppressed because one or more lines are too long
BIN
Python-3.13.9.tar.xz
(Stored with Git LFS)
Normal file
BIN
Python-3.13.9.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
1
Python-3.13.9.tar.xz.sigstore
Normal file
1
Python-3.13.9.tar.xz.sigstore
Normal file
File diff suppressed because one or more lines are too long
@@ -5,28 +5,30 @@ Subject: [PATCH] bpo-31046: ensurepip does not honour the value of $(prefix)
|
||||
|
||||
Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
|
||||
---
|
||||
Doc/library/ensurepip.rst | 9 +++--
|
||||
Doc/library/ensurepip.rst | 12 +++++-
|
||||
Lib/ensurepip/__init__.py | 18 +++++++---
|
||||
Lib/test/test_ensurepip.py | 11 ++++++
|
||||
Makefile.pre.in | 4 +-
|
||||
Misc/NEWS.d/next/Build/2019-12-16-17-50-42.bpo-31046.XA-Qfr.rst | 1
|
||||
5 files changed, 34 insertions(+), 9 deletions(-)
|
||||
5 files changed, 37 insertions(+), 9 deletions(-)
|
||||
create mode 100644 Misc/NEWS.d/next/Build/2019-12-16-17-50-42.bpo-31046.XA-Qfr.rst
|
||||
|
||||
--- a/Doc/library/ensurepip.rst
|
||||
+++ b/Doc/library/ensurepip.rst
|
||||
@@ -59,8 +59,9 @@ is at least as recent as the one availab
|
||||
@@ -61,7 +61,11 @@ is at least as recent as the one availab
|
||||
By default, ``pip`` is installed into the current virtual environment
|
||||
(if one is active) or into the system site packages (if there is no
|
||||
active virtual environment). The installation location can be controlled
|
||||
-through two additional command line options:
|
||||
+through some additional command line options:
|
||||
+
|
||||
+.. option:: --prefix <dir>
|
||||
+
|
||||
+ Installs ``pip`` using the given directory prefix.
|
||||
|
||||
+* ``--prefix <dir>``: Installs ``pip`` using the given directory prefix.
|
||||
* :samp:`--root {dir}`: Installs ``pip`` relative to the given root directory
|
||||
rather than the root of the currently active virtual environment (if any)
|
||||
or the default root for the current Python installation.
|
||||
@@ -92,7 +93,7 @@ Module API
|
||||
.. option:: --root <dir>
|
||||
|
||||
@@ -102,7 +106,7 @@ Module API
|
||||
Returns a string specifying the available version of pip that will be
|
||||
installed when bootstrapping an environment.
|
||||
|
||||
@@ -35,7 +37,7 @@ Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
|
||||
altinstall=False, default_pip=False, \
|
||||
verbosity=0)
|
||||
|
||||
@@ -102,6 +103,8 @@ Module API
|
||||
@@ -112,6 +116,8 @@ Module API
|
||||
If *root* is ``None``, then installation uses the default install location
|
||||
for the current environment.
|
||||
|
||||
@@ -44,7 +46,7 @@ Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
|
||||
*upgrade* indicates whether or not to upgrade an existing installation
|
||||
of an earlier version of ``pip`` to the available version.
|
||||
|
||||
@@ -122,6 +125,8 @@ Module API
|
||||
@@ -132,6 +138,8 @@ Module API
|
||||
*verbosity* controls the level of output to :data:`sys.stdout` from the
|
||||
bootstrapping operation.
|
||||
|
||||
@@ -139,7 +141,7 @@ Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
|
||||
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -2139,7 +2139,7 @@ install: @FRAMEWORKINSTALLFIRST@ @INSTAL
|
||||
@@ -2145,7 +2145,7 @@ install: @FRAMEWORKINSTALLFIRST@ @INSTAL
|
||||
install|*) ensurepip="" ;; \
|
||||
esac; \
|
||||
$(RUNSHARED) $(PYTHON_FOR_BUILD) -m ensurepip \
|
||||
@@ -148,7 +150,7 @@ Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
|
||||
fi
|
||||
|
||||
.PHONY: altinstall
|
||||
@@ -2150,7 +2150,7 @@ altinstall: commoninstall
|
||||
@@ -2156,7 +2156,7 @@ altinstall: commoninstall
|
||||
install|*) ensurepip="--altinstall" ;; \
|
||||
esac; \
|
||||
$(RUNSHARED) $(PYTHON_FOR_BUILD) -m ensurepip \
|
||||
|
||||
45
bsc1243155-sphinx-non-determinism.patch
Normal file
45
bsc1243155-sphinx-non-determinism.patch
Normal file
@@ -0,0 +1,45 @@
|
||||
From 906a590df191f66f4f0c4a70e3edb6fd82c156ef Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Garcia Moreno <daniel.garcia@suse.com>
|
||||
Date: Tue, 1 Jul 2025 12:13:28 +0200
|
||||
Subject: [PATCH] Doc: Generate ids for audit_events using docname
|
||||
|
||||
This patch generates ids for audit_events using the docname so the id is
|
||||
not global but depend on the source file. This make the doc build
|
||||
reproducible with multiple cores because it doesn't which file is parsed
|
||||
first, the id for audit_events will always be consistent independently
|
||||
of what file is parsed first.
|
||||
|
||||
https://github.com/python/cpython/issues/130979
|
||||
---
|
||||
Doc/tools/extensions/audit_events.py | 11 ++++++++---
|
||||
1 file changed, 8 insertions(+), 3 deletions(-)
|
||||
|
||||
Index: Python-3.13.6/Doc/tools/extensions/audit_events.py
|
||||
===================================================================
|
||||
--- Python-3.13.6.orig/Doc/tools/extensions/audit_events.py 2025-08-07 12:16:58.257103336 +0200
|
||||
+++ Python-3.13.6/Doc/tools/extensions/audit_events.py 2025-08-07 12:17:02.709401389 +0200
|
||||
@@ -72,8 +72,13 @@
|
||||
logger.warning(msg)
|
||||
return
|
||||
|
||||
- def id_for(self, name) -> str:
|
||||
- source_count = len(self.sources.get(name, set()))
|
||||
+ def _source_count(self, name, docname) -> int:
|
||||
+ """Count the event name in the same source"""
|
||||
+ sources = self.sources.get(name, set())
|
||||
+ return len([s for s, t in sources if s == docname])
|
||||
+
|
||||
+ def id_for(self, name, docname) -> str:
|
||||
+ source_count = self._source_count(name, docname)
|
||||
name_clean = re.sub(r"\W", "_", name)
|
||||
return f"audit_event_{name_clean}_{source_count}"
|
||||
|
||||
@@ -148,7 +153,7 @@
|
||||
except (IndexError, TypeError):
|
||||
target = None
|
||||
if not target:
|
||||
- target = self.env.audit_events.id_for(name)
|
||||
+ target = self.env.audit_events.id_for(name, self.env.docname)
|
||||
ids.append(target)
|
||||
self.env.audit_events.add_event(name, args, (self.env.docname, target))
|
||||
|
||||
@@ -1,35 +1,152 @@
|
||||
---
|
||||
Doc/conf.py | 17 ++++++++--
|
||||
Doc/tools/check-warnings.py | 3 +
|
||||
Doc/tools/extensions/audit_events.py | 54 ++++++++++++++++----------------
|
||||
Doc/tools/extensions/availability.py | 15 ++++----
|
||||
Doc/tools/extensions/c_annotations.py | 45 ++++++++++++++++----------
|
||||
Doc/tools/extensions/glossary_search.py | 10 +----
|
||||
Doc/tools/extensions/patchlevel.py | 9 ++---
|
||||
7 files changed, 87 insertions(+), 66 deletions(-)
|
||||
Doc/Makefile | 8 +--
|
||||
Doc/c-api/arg.rst | 1
|
||||
Doc/c-api/typeobj.rst | 8 +--
|
||||
Doc/conf.py | 29 ++++++++++---
|
||||
Doc/howto/free-threading-python.rst | 2
|
||||
Doc/library/doctest.rst | 1
|
||||
Doc/library/email.compat32-message.rst | 1
|
||||
Doc/library/xml.etree.elementtree.rst | 1
|
||||
Doc/Makefile | 8 +--
|
||||
Doc/c-api/arg.rst | 1
|
||||
Doc/c-api/typeobj.rst | 8 +--
|
||||
Doc/conf.py | 29 ++++++++++---
|
||||
Doc/library/doctest.rst | 1
|
||||
Doc/library/email.compat32-message.rst | 1
|
||||
Doc/library/xml.etree.elementtree.rst | 1
|
||||
Doc/tools/check-warnings.py | 5 +-
|
||||
Doc/tools/extensions/audit_events.py | 56 ++++++++++++++------------
|
||||
Doc/tools/extensions/availability.py | 15 +++---
|
||||
Doc/tools/extensions/c_annotations.py | 53 ++++++++++++++++--------
|
||||
Doc/tools/extensions/changes.py | 8 +--
|
||||
Doc/tools/extensions/glossary_search.py | 20 ++++++---
|
||||
Doc/tools/extensions/implementation_detail.py | 22 +++-------
|
||||
Doc/tools/extensions/issue_role.py | 16 ++-----
|
||||
Doc/tools/extensions/misc_news.py | 14 ++----
|
||||
Doc/tools/extensions/patchlevel.py | 9 ++--
|
||||
Doc/tools/extensions/pydoc_topics.py | 22 +++++-----
|
||||
18 files changed, 159 insertions(+), 130 deletions(-)
|
||||
|
||||
--- a/Doc/conf.py
|
||||
+++ b/Doc/conf.py
|
||||
@@ -17,6 +17,9 @@ sys.path.append(os.path.abspath('include
|
||||
# Python specific content from Doc/Tools/extensions/pyspecific.py
|
||||
from pyspecific import SOURCE_URI
|
||||
Index: Python-3.13.6/Doc/Makefile
|
||||
===================================================================
|
||||
--- Python-3.13.6.orig/Doc/Makefile 2025-08-06 15:05:20.000000000 +0200
|
||||
+++ Python-3.13.6/Doc/Makefile 2025-08-07 12:16:58.253706854 +0200
|
||||
@@ -14,15 +14,15 @@
|
||||
SOURCES =
|
||||
DISTVERSION = $(shell $(PYTHON) tools/extensions/patchlevel.py)
|
||||
REQUIREMENTS = requirements.txt
|
||||
-SPHINXERRORHANDLING = --fail-on-warning
|
||||
+SPHINXERRORHANDLING =
|
||||
|
||||
+# Needed for fixing extlinks modification
|
||||
+from sphinx import version_info as sphinx_version
|
||||
# Internal variables.
|
||||
PAPEROPT_a4 = --define latex_elements.papersize=a4paper
|
||||
PAPEROPT_letter = --define latex_elements.papersize=letterpaper
|
||||
|
||||
-ALLSPHINXOPTS = --builder $(BUILDER) \
|
||||
- --doctree-dir build/doctrees \
|
||||
- --jobs $(JOBS) \
|
||||
+ALLSPHINXOPTS = -b $(BUILDER) \
|
||||
+ -d build/doctrees \
|
||||
+ -j $(JOBS) \
|
||||
$(PAPEROPT_$(PAPER)) \
|
||||
$(SPHINXOPTS) $(SPHINXERRORHANDLING) \
|
||||
. build/$(BUILDER) $(SOURCES)
|
||||
Index: Python-3.13.6/Doc/c-api/arg.rst
|
||||
===================================================================
|
||||
--- Python-3.13.6.orig/Doc/c-api/arg.rst 2025-08-06 15:05:20.000000000 +0200
|
||||
+++ Python-3.13.6/Doc/c-api/arg.rst 2025-08-07 12:16:58.254160756 +0200
|
||||
@@ -334,7 +334,6 @@
|
||||
should raise an exception and leave the content of *address* unmodified.
|
||||
|
||||
.. c:macro:: Py_CLEANUP_SUPPORTED
|
||||
- :no-typesetting:
|
||||
|
||||
If the *converter* returns :c:macro:`!Py_CLEANUP_SUPPORTED`, it may get called a
|
||||
second time if the argument parsing eventually fails, giving the converter a
|
||||
Index: Python-3.13.6/Doc/c-api/typeobj.rst
|
||||
===================================================================
|
||||
--- Python-3.13.6.orig/Doc/c-api/typeobj.rst 2025-08-06 15:05:20.000000000 +0200
|
||||
+++ Python-3.13.6/Doc/c-api/typeobj.rst 2025-08-07 12:16:58.254692184 +0200
|
||||
@@ -610,7 +610,7 @@
|
||||
Functions like :c:func:`PyObject_NewVar` will take the value of N as an
|
||||
argument, and store in the instance's :c:member:`~PyVarObject.ob_size` field.
|
||||
Note that the :c:member:`~PyVarObject.ob_size` field may later be used for
|
||||
- other purposes. For example, :py:type:`int` instances use the bits of
|
||||
+ other purposes. For example, :py:obj:`int` instances use the bits of
|
||||
:c:member:`~PyVarObject.ob_size` in an implementation-defined
|
||||
way; the underlying storage and its size should be accessed using
|
||||
:c:func:`PyLong_Export`.
|
||||
@@ -622,9 +622,9 @@
|
||||
|
||||
Also, the presence of an :c:member:`~PyVarObject.ob_size` field in the
|
||||
instance layout doesn't mean that the instance structure is variable-length.
|
||||
- For example, the :py:type:`list` type has fixed-length instances, yet those
|
||||
+ For example, the :py:obj:`list` type has fixed-length instances, yet those
|
||||
instances have a :c:member:`~PyVarObject.ob_size` field.
|
||||
- (As with :py:type:`int`, avoid reading lists' :c:member:`!ob_size` directly.
|
||||
+ (As with :py:obj:`int`, avoid reading lists' :c:member:`!ob_size` directly.
|
||||
Call :c:func:`PyList_Size` instead.)
|
||||
|
||||
The :c:member:`!tp_basicsize` includes size needed for data of the type's
|
||||
@@ -637,7 +637,7 @@
|
||||
In other words, :c:member:`!tp_basicsize` must be greater than or equal
|
||||
to the base's :c:member:`!tp_basicsize`.
|
||||
|
||||
- Since every type is a subtype of :py:type:`object`, this struct must
|
||||
+ Since every type is a subtype of :py:obj:`object`, this struct must
|
||||
include :c:type:`PyObject` or :c:type:`PyVarObject` (depending on
|
||||
whether :c:member:`~PyVarObject.ob_size` should be included). These are
|
||||
usually defined by the macro :c:macro:`PyObject_HEAD` or
|
||||
Index: Python-3.13.6/Doc/conf.py
|
||||
===================================================================
|
||||
--- Python-3.13.6.orig/Doc/conf.py 2025-08-07 12:16:45.115568663 +0200
|
||||
+++ Python-3.13.6/Doc/conf.py 2025-08-07 12:16:58.255236531 +0200
|
||||
@@ -11,6 +11,8 @@
|
||||
from importlib import import_module
|
||||
from importlib.util import find_spec
|
||||
|
||||
+from sphinx import version_info
|
||||
+
|
||||
# General configuration
|
||||
# ---------------------
|
||||
# Make our custom extensions available to Sphinx
|
||||
sys.path.append(os.path.abspath('tools/extensions'))
|
||||
sys.path.append(os.path.abspath('includes'))
|
||||
@@ -57,11 +59,11 @@
|
||||
import _tkinter
|
||||
except ImportError:
|
||||
_tkinter = None
|
||||
-# Treat warnings as errors, done here to prevent warnings in Sphinx code from
|
||||
-# causing spurious CPython test failures.
|
||||
-import warnings
|
||||
-warnings.simplefilter('error')
|
||||
-del warnings
|
||||
+# # Treat warnings as errors, done here to prevent warnings in Sphinx code from
|
||||
+# # causing spurious CPython test failures.
|
||||
+# import warnings
|
||||
+# warnings.simplefilter('error')
|
||||
+# del warnings
|
||||
'''
|
||||
|
||||
@@ -90,7 +93,7 @@ highlight_language = 'python3'
|
||||
manpages_url = 'https://manpages.debian.org/{path}'
|
||||
@@ -96,7 +98,7 @@
|
||||
|
||||
# Minimum version of sphinx required
|
||||
# Keep this version in sync with ``Doc/requirements.txt``.
|
||||
-needs_sphinx = '8.1.3'
|
||||
-needs_sphinx = '8.2.0'
|
||||
+needs_sphinx = '4.2.0'
|
||||
|
||||
# Create table of contents entries for domain objects (e.g. functions, classes,
|
||||
# attributes, etc.). Default is True.
|
||||
@@ -359,7 +362,7 @@ html_short_title = f'{release} Documenta
|
||||
@@ -258,6 +260,9 @@
|
||||
# Avoid a warning with Sphinx >= 4.0
|
||||
root_doc = 'contents'
|
||||
|
||||
+# Compatibility on old Sphinx
|
||||
+suppress_warnings = ['pygments.ParserNotFound']
|
||||
+
|
||||
# Allow translation of index directives
|
||||
gettext_additional_targets = [
|
||||
'index',
|
||||
@@ -297,7 +302,7 @@
|
||||
# (See .readthedocs.yml and https://docs.readthedocs.io/en/stable/reference/environment-variables.html)
|
||||
is_deployment_preview = os.getenv("READTHEDOCS_VERSION_TYPE") == "external"
|
||||
repository_url = os.getenv("READTHEDOCS_GIT_CLONE_URL", "")
|
||||
@@ -38,11 +155,11 @@
|
||||
html_context = {
|
||||
"is_deployment_preview": is_deployment_preview,
|
||||
"repository_url": repository_url or None,
|
||||
@@ -604,6 +607,16 @@ extlinks = {
|
||||
@@ -542,6 +547,16 @@
|
||||
}
|
||||
extlinks_detect_hardcoded_links = True
|
||||
|
||||
+if sphinx_version[:2] < (8, 1):
|
||||
+if version_info[:2] < (8, 1):
|
||||
+ # Sphinx 8.1 has in-built CVE and CWE roles.
|
||||
+ extlinks.update({
|
||||
+ "cve": (
|
||||
@@ -55,9 +172,47 @@
|
||||
# Options for c_annotations extension
|
||||
# -----------------------------------
|
||||
|
||||
--- a/Doc/tools/check-warnings.py
|
||||
+++ b/Doc/tools/check-warnings.py
|
||||
@@ -228,7 +228,8 @@ def fail_if_regression(
|
||||
Index: Python-3.13.6/Doc/library/doctest.rst
|
||||
===================================================================
|
||||
--- Python-3.13.6.orig/Doc/library/doctest.rst 2025-08-06 15:05:20.000000000 +0200
|
||||
+++ Python-3.13.6/Doc/library/doctest.rst 2025-08-07 12:16:58.255583157 +0200
|
||||
@@ -310,7 +310,6 @@
|
||||
.. currentmodule:: None
|
||||
|
||||
.. attribute:: module.__test__
|
||||
- :no-typesetting:
|
||||
|
||||
.. currentmodule:: doctest
|
||||
|
||||
Index: Python-3.13.6/Doc/library/email.compat32-message.rst
|
||||
===================================================================
|
||||
--- Python-3.13.6.orig/Doc/library/email.compat32-message.rst 2025-08-06 15:05:20.000000000 +0200
|
||||
+++ Python-3.13.6/Doc/library/email.compat32-message.rst 2025-08-07 12:16:58.256095517 +0200
|
||||
@@ -7,7 +7,6 @@
|
||||
:synopsis: The base class representing email messages in a fashion
|
||||
backward compatible with Python 3.2
|
||||
:noindex:
|
||||
- :no-index:
|
||||
|
||||
|
||||
The :class:`Message` class is very similar to the
|
||||
Index: Python-3.13.6/Doc/library/xml.etree.elementtree.rst
|
||||
===================================================================
|
||||
--- Python-3.13.6.orig/Doc/library/xml.etree.elementtree.rst 2025-08-06 15:05:20.000000000 +0200
|
||||
+++ Python-3.13.6/Doc/library/xml.etree.elementtree.rst 2025-08-07 12:16:58.256380542 +0200
|
||||
@@ -873,7 +873,6 @@
|
||||
|
||||
.. module:: xml.etree.ElementTree
|
||||
:noindex:
|
||||
- :no-index:
|
||||
|
||||
.. class:: Element(tag, attrib={}, **extra)
|
||||
|
||||
Index: Python-3.13.6/Doc/tools/check-warnings.py
|
||||
===================================================================
|
||||
--- Python-3.13.6.orig/Doc/tools/check-warnings.py 2025-08-06 15:05:20.000000000 +0200
|
||||
+++ Python-3.13.6/Doc/tools/check-warnings.py 2025-08-07 12:16:58.256796101 +0200
|
||||
@@ -228,7 +228,8 @@
|
||||
print(filename)
|
||||
for warning in warnings:
|
||||
if filename in warning:
|
||||
@@ -67,8 +222,19 @@
|
||||
print(" {line}: {msg}".format_map(match))
|
||||
return -1
|
||||
return 0
|
||||
--- a/Doc/tools/extensions/audit_events.py
|
||||
+++ b/Doc/tools/extensions/audit_events.py
|
||||
@@ -316,7 +317,7 @@
|
||||
|
||||
cwd = str(Path.cwd()) + os.path.sep
|
||||
files_with_nits = {
|
||||
- warning.removeprefix(cwd).split(":")[0]
|
||||
+ (warning[len(cwd):].split(":")[0] if warning.startswith(cwd) else warning.split(":")[0])
|
||||
for warning in warnings
|
||||
if "Doc/" in warning
|
||||
}
|
||||
Index: Python-3.13.6/Doc/tools/extensions/audit_events.py
|
||||
===================================================================
|
||||
--- Python-3.13.6.orig/Doc/tools/extensions/audit_events.py 2025-08-06 15:05:20.000000000 +0200
|
||||
+++ Python-3.13.6/Doc/tools/extensions/audit_events.py 2025-08-07 12:16:58.257103336 +0200
|
||||
@@ -1,9 +1,6 @@
|
||||
"""Support for documenting audit events."""
|
||||
|
||||
@@ -79,34 +245,42 @@
|
||||
|
||||
from docutils import nodes
|
||||
from sphinx.errors import NoUri
|
||||
@@ -12,12 +9,11 @@ from sphinx.transforms.post_transforms i
|
||||
@@ -12,12 +9,19 @@
|
||||
from sphinx.util import logging
|
||||
from sphinx.util.docutils import SphinxDirective
|
||||
|
||||
-if TYPE_CHECKING:
|
||||
- from collections.abc import Iterator
|
||||
+from typing import Any, List, Tuple
|
||||
- from collections.abc import Iterator, Set
|
||||
+from typing import Any, Iterator, List, Set, Tuple
|
||||
+
|
||||
+from sphinx.application import Sphinx
|
||||
+from sphinx.builders import Builder
|
||||
+from sphinx.environment import BuildEnvironment
|
||||
+
|
||||
+# --- The Monkey Patch ---
|
||||
+def findall_patch(self, *args, **kwargs):
|
||||
+ """A backwards-compatible findall method that calls traverse."""
|
||||
+ return self.traverse(*args, **kwargs)
|
||||
|
||||
- from sphinx.application import Sphinx
|
||||
- from sphinx.builders import Builder
|
||||
- from sphinx.environment import BuildEnvironment
|
||||
+from sphinx.application import Sphinx
|
||||
+from sphinx.builders import Builder
|
||||
+from sphinx.environment import BuildEnvironment
|
||||
+if not hasattr(nodes.Node, 'findall'):
|
||||
+ nodes.Node.findall = findall_patch
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@@ -32,16 +28,16 @@ _SYNONYMS = [
|
||||
@@ -32,16 +36,16 @@
|
||||
|
||||
class AuditEvents:
|
||||
def __init__(self) -> None:
|
||||
- self.events: dict[str, list[str]] = {}
|
||||
- self.sources: dict[str, list[tuple[str, str]]] = {}
|
||||
- self.sources: dict[str, set[tuple[str, str]]] = {}
|
||||
+ self.events: dict[str, List[str]] = {}
|
||||
+ self.sources: dict[str, List[Tuple[str, str]]] = {}
|
||||
+ self.sources: dict[str, Set[Tuple[str, str]]] = {}
|
||||
|
||||
- def __iter__(self) -> Iterator[tuple[str, list[str], tuple[str, str]]]:
|
||||
+ def __iter__(self) -> Any:
|
||||
+ def __iter__(self) -> Iterator[Any]:
|
||||
for name, args in self.events.items():
|
||||
for source in self.sources[name]:
|
||||
yield name, args, source
|
||||
@@ -117,16 +291,16 @@
|
||||
) -> None:
|
||||
if name in self.events:
|
||||
self._check_args_match(name, args)
|
||||
@@ -49,7 +45,7 @@ class AuditEvents:
|
||||
@@ -49,7 +53,7 @@
|
||||
self.events[name] = args
|
||||
self.sources.setdefault(name, []).append(source)
|
||||
self.sources.setdefault(name, set()).add(source)
|
||||
|
||||
- def _check_args_match(self, name: str, args: list[str]) -> None:
|
||||
+ def _check_args_match(self, name: str, args: List[str]) -> None:
|
||||
current_args = self.events[name]
|
||||
msg = (
|
||||
f"Mismatched arguments for audit-event {name}: "
|
||||
@@ -60,7 +56,7 @@ class AuditEvents:
|
||||
@@ -60,7 +64,7 @@
|
||||
if len(current_args) != len(args):
|
||||
logger.warning(msg)
|
||||
return
|
||||
@@ -135,16 +309,16 @@
|
||||
if a1 == a2:
|
||||
continue
|
||||
if any(a1 in s and a2 in s for s in _SYNONYMS):
|
||||
@@ -73,7 +69,7 @@ class AuditEvents:
|
||||
@@ -73,7 +77,7 @@
|
||||
name_clean = re.sub(r"\W", "_", name)
|
||||
return f"audit_event_{name_clean}_{source_count}"
|
||||
|
||||
- def rows(self) -> Iterator[tuple[str, list[str], list[tuple[str, str]]]]:
|
||||
+ def rows(self) -> Any:
|
||||
- def rows(self) -> Iterator[tuple[str, list[str], Set[tuple[str, str]]]]:
|
||||
+ def rows(self) -> Iterator[Any]:
|
||||
for name in sorted(self.events.keys()):
|
||||
yield name, self.events[name], self.sources[name]
|
||||
|
||||
@@ -97,7 +93,7 @@ def audit_events_purge(
|
||||
@@ -97,7 +101,7 @@
|
||||
def audit_events_merge(
|
||||
app: Sphinx,
|
||||
env: BuildEnvironment,
|
||||
@@ -153,7 +327,7 @@
|
||||
other: BuildEnvironment,
|
||||
) -> None:
|
||||
"""In Sphinx parallel builds, this merges audit_events from subprocesses."""
|
||||
@@ -126,14 +122,16 @@ class AuditEvent(SphinxDirective):
|
||||
@@ -126,14 +130,16 @@
|
||||
),
|
||||
]
|
||||
|
||||
@@ -176,7 +350,7 @@
|
||||
else:
|
||||
args = []
|
||||
ids = []
|
||||
@@ -169,7 +167,7 @@ class audit_event_list(nodes.General, no
|
||||
@@ -169,7 +175,7 @@
|
||||
|
||||
|
||||
class AuditEventListDirective(SphinxDirective):
|
||||
@@ -185,32 +359,21 @@
|
||||
return [audit_event_list()]
|
||||
|
||||
|
||||
@@ -181,7 +179,11 @@ class AuditEventListTransform(SphinxPost
|
||||
return
|
||||
|
||||
table = self._make_table(self.app.builder, self.env.docname)
|
||||
- for node in self.document.findall(audit_event_list):
|
||||
+ try:
|
||||
+ findall = self.document.findall
|
||||
+ except AttributeError:
|
||||
+ findall = self.document.traverse
|
||||
+ for node in findall(audit_event_list):
|
||||
node.replace_self(table)
|
||||
|
||||
def _make_table(self, builder: Builder, docname: str) -> nodes.table:
|
||||
@@ -217,8 +219,8 @@ class AuditEventListTransform(SphinxPost
|
||||
@@ -217,8 +223,8 @@
|
||||
builder: Builder,
|
||||
docname: str,
|
||||
name: str,
|
||||
- args: list[str],
|
||||
- sources: list[tuple[str, str]],
|
||||
- sources: Set[tuple[str, str]],
|
||||
+ args: List[str],
|
||||
+ sources: List[Tuple[str, str]],
|
||||
+ sources: Set[Tuple[str, str]],
|
||||
) -> nodes.row:
|
||||
row = nodes.row()
|
||||
name_node = nodes.paragraph("", nodes.Text(name))
|
||||
--- a/Doc/tools/extensions/availability.py
|
||||
+++ b/Doc/tools/extensions/availability.py
|
||||
Index: Python-3.13.6/Doc/tools/extensions/availability.py
|
||||
===================================================================
|
||||
--- Python-3.13.6.orig/Doc/tools/extensions/availability.py 2025-08-06 15:05:20.000000000 +0200
|
||||
+++ Python-3.13.6/Doc/tools/extensions/availability.py 2025-08-07 12:16:58.257352322 +0200
|
||||
@@ -1,8 +1,6 @@
|
||||
"""Support for documenting platform availability"""
|
||||
|
||||
@@ -221,7 +384,7 @@
|
||||
|
||||
from docutils import nodes
|
||||
from sphinx import addnodes
|
||||
@@ -55,7 +53,7 @@ class Availability(SphinxDirective):
|
||||
@@ -55,7 +53,7 @@
|
||||
optional_arguments = 0
|
||||
final_argument_whitespace = True
|
||||
|
||||
@@ -230,7 +393,7 @@
|
||||
title = sphinx_gettext("Availability")
|
||||
refnode = addnodes.pending_xref(
|
||||
title,
|
||||
@@ -79,7 +77,7 @@ class Availability(SphinxDirective):
|
||||
@@ -79,7 +77,7 @@
|
||||
|
||||
return [cnode]
|
||||
|
||||
@@ -239,7 +402,7 @@
|
||||
"""Parse platform information from arguments
|
||||
|
||||
Arguments is a comma-separated string of platforms. A platform may
|
||||
@@ -98,12 +96,13 @@ class Availability(SphinxDirective):
|
||||
@@ -98,12 +96,13 @@
|
||||
platform, _, version = arg.partition(" >= ")
|
||||
if platform.startswith("not "):
|
||||
version = False
|
||||
@@ -255,7 +418,7 @@
|
||||
logger.warning(
|
||||
"Unknown platform%s or syntax '%s' in '.. availability:: %s', "
|
||||
"see %s:KNOWN_PLATFORMS for a set of known platforms.",
|
||||
@@ -116,7 +115,7 @@ class Availability(SphinxDirective):
|
||||
@@ -116,7 +115,7 @@
|
||||
return platforms
|
||||
|
||||
|
||||
@@ -264,9 +427,11 @@
|
||||
app.add_directive("availability", Availability)
|
||||
|
||||
return {
|
||||
--- a/Doc/tools/extensions/c_annotations.py
|
||||
+++ b/Doc/tools/extensions/c_annotations.py
|
||||
@@ -9,22 +9,18 @@ Configuration:
|
||||
Index: Python-3.13.6/Doc/tools/extensions/c_annotations.py
|
||||
===================================================================
|
||||
--- Python-3.13.6.orig/Doc/tools/extensions/c_annotations.py 2025-08-06 15:05:20.000000000 +0200
|
||||
+++ Python-3.13.6/Doc/tools/extensions/c_annotations.py 2025-08-07 12:16:58.257571556 +0200
|
||||
@@ -9,22 +9,26 @@
|
||||
* Set ``stable_abi_file`` to the path to stable ABI list.
|
||||
"""
|
||||
|
||||
@@ -289,10 +454,18 @@
|
||||
- from sphinx.application import Sphinx
|
||||
- from sphinx.util.typing import ExtensionMetadata
|
||||
+from sphinx.application import Sphinx
|
||||
+
|
||||
+# --- The Monkey Patch ---
|
||||
+def findall_patch(self, *args, **kwargs):
|
||||
+ """A backwards-compatible findall method that calls traverse."""
|
||||
+ return self.traverse(*args, **kwargs)
|
||||
+
|
||||
+if not hasattr(nodes.Node, 'findall'):
|
||||
+ nodes.Node.findall = findall_patch
|
||||
|
||||
ROLE_TO_OBJECT_TYPE = {
|
||||
"func": "function",
|
||||
@@ -35,20 +31,20 @@ ROLE_TO_OBJECT_TYPE = {
|
||||
@@ -35,20 +39,20 @@
|
||||
}
|
||||
|
||||
|
||||
@@ -317,7 +490,7 @@
|
||||
class StableABIEntry:
|
||||
# Role of the object.
|
||||
# Source: Each [item_kind] in stable_abi.toml is mapped to a C Domain role.
|
||||
@@ -67,7 +63,7 @@ class StableABIEntry:
|
||||
@@ -67,7 +71,7 @@
|
||||
struct_abi_kind: str
|
||||
|
||||
|
||||
@@ -326,7 +499,7 @@
|
||||
refcount_data = {}
|
||||
refcounts = refcount_filename.read_text(encoding="utf8")
|
||||
for line in refcounts.splitlines():
|
||||
@@ -103,7 +99,7 @@ def read_refcount_data(refcount_filename
|
||||
@@ -103,7 +107,7 @@
|
||||
return refcount_data
|
||||
|
||||
|
||||
@@ -335,7 +508,7 @@
|
||||
stable_abi_data = {}
|
||||
with open(stable_abi_file, encoding="utf8") as fp:
|
||||
for record in csv.DictReader(fp):
|
||||
@@ -123,11 +119,14 @@ def add_annotations(app: Sphinx, doctree
|
||||
@@ -123,11 +127,14 @@
|
||||
continue
|
||||
if not par[0].get("ids", None):
|
||||
continue
|
||||
@@ -352,7 +525,7 @@
|
||||
if ROLE_TO_OBJECT_TYPE[record.role] != objtype:
|
||||
msg = (
|
||||
f"Object type mismatch in limited API annotation for {name}: "
|
||||
@@ -234,7 +233,7 @@ def _unstable_api_annotation() -> nodes.
|
||||
@@ -234,7 +241,7 @@
|
||||
)
|
||||
|
||||
|
||||
@@ -361,7 +534,7 @@
|
||||
classes = ["refcount"]
|
||||
if result_refs is None:
|
||||
rc = sphinx_gettext("Return value: Always NULL.")
|
||||
@@ -254,7 +253,7 @@ class LimitedAPIList(SphinxDirective):
|
||||
@@ -254,7 +261,7 @@
|
||||
optional_arguments = 0
|
||||
final_argument_whitespace = True
|
||||
|
||||
@@ -370,7 +543,7 @@
|
||||
state = self.env.domaindata["c_annotations"]
|
||||
content = [
|
||||
f"* :c:{record.role}:`{record.name}`"
|
||||
@@ -277,13 +276,23 @@ def init_annotations(app: Sphinx) -> Non
|
||||
@@ -277,13 +284,23 @@
|
||||
)
|
||||
|
||||
|
||||
@@ -395,9 +568,50 @@
|
||||
return {
|
||||
"version": "1.0",
|
||||
"parallel_read_safe": True,
|
||||
--- a/Doc/tools/extensions/glossary_search.py
|
||||
+++ b/Doc/tools/extensions/glossary_search.py
|
||||
@@ -1,18 +1,14 @@
|
||||
Index: Python-3.13.6/Doc/tools/extensions/changes.py
|
||||
===================================================================
|
||||
--- Python-3.13.6.orig/Doc/tools/extensions/changes.py 2025-08-06 15:05:20.000000000 +0200
|
||||
+++ Python-3.13.6/Doc/tools/extensions/changes.py 2025-08-07 12:16:58.257773818 +0200
|
||||
@@ -1,7 +1,5 @@
|
||||
"""Support for documenting version of changes, additions, deprecations."""
|
||||
|
||||
-from __future__ import annotations
|
||||
-
|
||||
from typing import TYPE_CHECKING
|
||||
|
||||
from sphinx.domains.changeset import (
|
||||
@@ -25,7 +23,7 @@
|
||||
|
||||
|
||||
class PyVersionChange(VersionChange):
|
||||
- def run(self) -> list[Node]:
|
||||
+ def run(self) -> "list[Node]":
|
||||
# Replace the 'next' special token with the current development version
|
||||
self.arguments[0] = expand_version_arg(
|
||||
self.arguments[0], self.config.release
|
||||
@@ -43,7 +41,7 @@
|
||||
"Deprecated since version %s, removed in version %s"
|
||||
)
|
||||
|
||||
- def run(self) -> list[Node]:
|
||||
+ def run(self) -> "list[Node]":
|
||||
# Replace the first two arguments (deprecated version and removed version)
|
||||
# with a single tuple of both versions.
|
||||
version_deprecated = expand_version_arg(
|
||||
@@ -73,7 +71,7 @@
|
||||
versionlabel_classes[self.name] = ""
|
||||
|
||||
|
||||
-def setup(app: Sphinx) -> ExtensionMetadata:
|
||||
+def setup(app: "Sphinx") -> "ExtensionMetadata":
|
||||
# Override Sphinx's directives with support for 'next'
|
||||
app.add_directive("versionadded", PyVersionChange, override=True)
|
||||
app.add_directive("versionchanged", PyVersionChange, override=True)
|
||||
Index: Python-3.13.6/Doc/tools/extensions/glossary_search.py
|
||||
===================================================================
|
||||
--- Python-3.13.6.orig/Doc/tools/extensions/glossary_search.py 2025-08-06 15:05:20.000000000 +0200
|
||||
+++ Python-3.13.6/Doc/tools/extensions/glossary_search.py 2025-08-07 12:16:58.257959947 +0200
|
||||
@@ -1,21 +1,27 @@
|
||||
"""Feature search results for glossary items prominently."""
|
||||
|
||||
-from __future__ import annotations
|
||||
@@ -418,7 +632,20 @@
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@@ -52,7 +48,7 @@ def write_glossary_json(app: Sphinx, _ex
|
||||
+from docutils import nodes
|
||||
+from sphinx import addnodes
|
||||
+
|
||||
+# --- The Monkey Patch ---
|
||||
+def findall_patch(self, *args, **kwargs):
|
||||
+ """A backwards-compatible findall method that calls traverse."""
|
||||
+ return self.traverse(*args, **kwargs)
|
||||
+
|
||||
+if not hasattr(nodes.Node, 'findall'):
|
||||
+ nodes.Node.findall = findall_patch
|
||||
|
||||
def process_glossary_nodes(
|
||||
app: Sphinx,
|
||||
@@ -52,7 +58,7 @@
|
||||
dest.write_text(json.dumps(app.env.glossary_terms), encoding='utf-8')
|
||||
|
||||
|
||||
@@ -427,8 +654,169 @@
|
||||
app.connect('doctree-resolved', process_glossary_nodes)
|
||||
app.connect('build-finished', write_glossary_json)
|
||||
|
||||
--- a/Doc/tools/extensions/patchlevel.py
|
||||
+++ b/Doc/tools/extensions/patchlevel.py
|
||||
Index: Python-3.13.6/Doc/tools/extensions/implementation_detail.py
|
||||
===================================================================
|
||||
--- Python-3.13.6.orig/Doc/tools/extensions/implementation_detail.py 2025-08-06 15:05:20.000000000 +0200
|
||||
+++ Python-3.13.6/Doc/tools/extensions/implementation_detail.py 2025-08-07 12:16:58.258140488 +0200
|
||||
@@ -1,17 +1,10 @@
|
||||
"""Support for marking up implementation details."""
|
||||
|
||||
-from __future__ import annotations
|
||||
-
|
||||
-from typing import TYPE_CHECKING
|
||||
-
|
||||
from docutils import nodes
|
||||
from sphinx.locale import _ as sphinx_gettext
|
||||
from sphinx.util.docutils import SphinxDirective
|
||||
|
||||
-if TYPE_CHECKING:
|
||||
- from sphinx.application import Sphinx
|
||||
- from sphinx.util.typing import ExtensionMetadata
|
||||
-
|
||||
+from sphinx.application import Sphinx
|
||||
|
||||
class ImplementationDetail(SphinxDirective):
|
||||
has_content = True
|
||||
@@ -21,23 +14,24 @@
|
||||
label_text = sphinx_gettext("CPython implementation detail:")
|
||||
|
||||
def run(self):
|
||||
- self.assert_has_content()
|
||||
- content_nodes = self.parse_content_to_nodes()
|
||||
+ container_node = nodes.container()
|
||||
+ container_node.document = self.state.document # Ensure node has document context
|
||||
+ self.state.nested_parse(self.content, self.content_offset, container_node)
|
||||
+ parsed_nodes = container_node.children
|
||||
|
||||
# insert our prefix at the start of the first paragraph
|
||||
- first_node = content_nodes[0]
|
||||
+ first_node = parsed_nodes[0]
|
||||
first_node[:0] = [
|
||||
nodes.strong(self.label_text, self.label_text),
|
||||
nodes.Text(" "),
|
||||
]
|
||||
|
||||
- # create a new compound container node
|
||||
- cnode = nodes.compound("", *content_nodes, classes=["impl-detail"])
|
||||
+ cnode = nodes.compound("", *parsed_nodes, classes=["impl-detail"])
|
||||
self.set_source_info(cnode)
|
||||
return [cnode]
|
||||
|
||||
|
||||
-def setup(app: Sphinx) -> ExtensionMetadata:
|
||||
+def setup(app: Sphinx):
|
||||
app.add_directive("impl-detail", ImplementationDetail)
|
||||
|
||||
return {
|
||||
Index: Python-3.13.6/Doc/tools/extensions/issue_role.py
|
||||
===================================================================
|
||||
--- Python-3.13.6.orig/Doc/tools/extensions/issue_role.py 2025-08-06 15:05:20.000000000 +0200
|
||||
+++ Python-3.13.6/Doc/tools/extensions/issue_role.py 2025-08-07 12:16:58.258306293 +0200
|
||||
@@ -1,22 +1,18 @@
|
||||
"""Support for referencing issues in the tracker."""
|
||||
|
||||
-from __future__ import annotations
|
||||
-
|
||||
-from typing import TYPE_CHECKING
|
||||
+from typing import TYPE_CHECKING, List, Tuple
|
||||
|
||||
from docutils import nodes
|
||||
from sphinx.util.docutils import SphinxRole
|
||||
|
||||
-if TYPE_CHECKING:
|
||||
- from docutils.nodes import Element
|
||||
- from sphinx.application import Sphinx
|
||||
- from sphinx.util.typing import ExtensionMetadata
|
||||
+from docutils.nodes import Element
|
||||
+from sphinx.application import Sphinx
|
||||
|
||||
|
||||
class BPOIssue(SphinxRole):
|
||||
ISSUE_URI = "https://bugs.python.org/issue?@action=redirect&bpo={0}"
|
||||
|
||||
- def run(self) -> tuple[list[Element], list[nodes.system_message]]:
|
||||
+ def run(self) -> Tuple[List[Element], List[nodes.system_message]]:
|
||||
issue = self.text
|
||||
|
||||
# sanity check: there are no bpo issues within these two values
|
||||
@@ -38,7 +34,7 @@
|
||||
class GitHubIssue(SphinxRole):
|
||||
ISSUE_URI = "https://github.com/python/cpython/issues/{0}"
|
||||
|
||||
- def run(self) -> tuple[list[Element], list[nodes.system_message]]:
|
||||
+ def run(self) -> Tuple[List[Element], List[nodes.system_message]]:
|
||||
issue = self.text
|
||||
|
||||
# sanity check: all GitHub issues have ID >= 32426
|
||||
@@ -58,7 +54,7 @@
|
||||
return [refnode], []
|
||||
|
||||
|
||||
-def setup(app: Sphinx) -> ExtensionMetadata:
|
||||
+def setup(app: Sphinx) -> "ExtensionMetadata":
|
||||
app.add_role("issue", BPOIssue())
|
||||
app.add_role("gh", GitHubIssue())
|
||||
|
||||
Index: Python-3.13.6/Doc/tools/extensions/misc_news.py
|
||||
===================================================================
|
||||
--- Python-3.13.6.orig/Doc/tools/extensions/misc_news.py 2025-08-06 15:05:20.000000000 +0200
|
||||
+++ Python-3.13.6/Doc/tools/extensions/misc_news.py 2025-08-07 12:16:58.258481107 +0200
|
||||
@@ -1,7 +1,5 @@
|
||||
"""Support for including Misc/NEWS."""
|
||||
|
||||
-from __future__ import annotations
|
||||
-
|
||||
import re
|
||||
from pathlib import Path
|
||||
from typing import TYPE_CHECKING
|
||||
@@ -24,13 +22,13 @@
|
||||
+++++++++++
|
||||
"""
|
||||
|
||||
-bpo_issue_re: Final[re.Pattern[str]] = re.compile(
|
||||
+bpo_issue_re: "Final[re.Pattern[str]]" = re.compile(
|
||||
"(?:issue #|bpo-)([0-9]+)", re.ASCII
|
||||
)
|
||||
-gh_issue_re: Final[re.Pattern[str]] = re.compile(
|
||||
+gh_issue_re: "Final[re.Pattern[str]]" = re.compile(
|
||||
"gh-(?:issue-)?([0-9]+)", re.ASCII | re.IGNORECASE
|
||||
)
|
||||
-whatsnew_re: Final[re.Pattern[str]] = re.compile(
|
||||
+whatsnew_re: "Final[re.Pattern[str]]" = re.compile(
|
||||
r"^what's new in (.*?)\??$", re.ASCII | re.IGNORECASE | re.MULTILINE
|
||||
)
|
||||
|
||||
@@ -42,7 +40,7 @@
|
||||
final_argument_whitespace = False
|
||||
option_spec = {}
|
||||
|
||||
- def run(self) -> list[Node]:
|
||||
+ def run(self) -> "list[Node]":
|
||||
# Get content of NEWS file
|
||||
source, _ = self.get_source_info()
|
||||
news_file = Path(source).resolve().parent / self.arguments[0]
|
||||
@@ -54,7 +52,7 @@
|
||||
return [nodes.strong(text, text)]
|
||||
|
||||
# remove first 3 lines as they are the main heading
|
||||
- news_text = news_text.removeprefix(BLURB_HEADER)
|
||||
+ news_text = news_text[len(BLURB_HEADER):] if news_text.startswith(BLURB_HEADER) else news_text
|
||||
|
||||
news_text = bpo_issue_re.sub(r":issue:`\1`", news_text)
|
||||
# Fallback handling for GitHub issues
|
||||
@@ -65,7 +63,7 @@
|
||||
return []
|
||||
|
||||
|
||||
-def setup(app: Sphinx) -> ExtensionMetadata:
|
||||
+def setup(app: "Sphinx") -> "ExtensionMetadata":
|
||||
app.add_directive("miscnews", MiscNews)
|
||||
|
||||
return {
|
||||
Index: Python-3.13.6/Doc/tools/extensions/patchlevel.py
|
||||
===================================================================
|
||||
--- Python-3.13.6.orig/Doc/tools/extensions/patchlevel.py 2025-08-06 15:05:20.000000000 +0200
|
||||
+++ Python-3.13.6/Doc/tools/extensions/patchlevel.py 2025-08-07 12:16:58.258716335 +0200
|
||||
@@ -3,7 +3,7 @@
|
||||
import re
|
||||
import sys
|
||||
@@ -438,7 +826,7 @@
|
||||
|
||||
CPYTHON_ROOT = Path(
|
||||
__file__, # cpython/Doc/tools/extensions/patchlevel.py
|
||||
@@ -26,7 +26,7 @@ class version_info(NamedTuple): # noqa:
|
||||
@@ -26,7 +26,7 @@
|
||||
major: int #: Major release number
|
||||
minor: int #: Minor release number
|
||||
micro: int #: Patch release number
|
||||
@@ -447,7 +835,7 @@
|
||||
serial: int #: Serial release number
|
||||
|
||||
|
||||
@@ -37,7 +37,8 @@ def get_header_version_info() -> version
|
||||
@@ -37,7 +37,8 @@
|
||||
defines = {}
|
||||
patchlevel_h = PATCHLEVEL_H.read_text(encoding="utf-8")
|
||||
for line in patchlevel_h.splitlines():
|
||||
@@ -457,7 +845,7 @@
|
||||
name, value = m.groups()
|
||||
defines[name] = value
|
||||
|
||||
@@ -50,7 +51,7 @@ def get_header_version_info() -> version
|
||||
@@ -50,7 +51,7 @@
|
||||
)
|
||||
|
||||
|
||||
@@ -466,3 +854,65 @@
|
||||
version = f"{info.major}.{info.minor}"
|
||||
release = f"{info.major}.{info.minor}.{info.micro}"
|
||||
if info.releaselevel != "final":
|
||||
Index: Python-3.13.6/Doc/tools/extensions/pydoc_topics.py
|
||||
===================================================================
|
||||
--- Python-3.13.6.orig/Doc/tools/extensions/pydoc_topics.py 2025-08-06 15:05:20.000000000 +0200
|
||||
+++ Python-3.13.6/Doc/tools/extensions/pydoc_topics.py 2025-08-07 12:16:58.258911962 +0200
|
||||
@@ -1,21 +1,23 @@
|
||||
"""Support for building "topic help" for pydoc."""
|
||||
|
||||
-from __future__ import annotations
|
||||
-
|
||||
from time import asctime
|
||||
-from typing import TYPE_CHECKING
|
||||
+from typing import TYPE_CHECKING, Tuple
|
||||
|
||||
from sphinx.builders.text import TextBuilder
|
||||
from sphinx.util import logging
|
||||
-from sphinx.util.display import status_iterator
|
||||
+try:
|
||||
+ from sphinx.util.display import status_iterator
|
||||
+except ModuleNotFoundError:
|
||||
+ from sphinx.util import status_iterator
|
||||
from sphinx.util.docutils import new_document
|
||||
from sphinx.writers.text import TextTranslator
|
||||
|
||||
-if TYPE_CHECKING:
|
||||
+try:
|
||||
+ from typing import Sequence, Set
|
||||
+except ModuleNotFoundError:
|
||||
from collections.abc import Sequence, Set
|
||||
|
||||
- from sphinx.application import Sphinx
|
||||
- from sphinx.util.typing import ExtensionMetadata
|
||||
+from sphinx.application import Sphinx
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@@ -162,7 +164,7 @@
|
||||
self.outdir.joinpath("topics.py").write_text(topics, encoding="utf-8")
|
||||
|
||||
|
||||
-def _display_labels(item: tuple[str, Sequence[tuple[str, str]]]) -> str:
|
||||
+def _display_labels(item: Tuple[str, Sequence[Tuple[str, str]]]) -> str:
|
||||
_docname, label_ids = item
|
||||
labels = [name for name, _id in label_ids]
|
||||
if len(labels) > 4:
|
||||
@@ -170,7 +172,7 @@
|
||||
return ", ".join(labels)
|
||||
|
||||
|
||||
-def _repr(text: str, /) -> str:
|
||||
+def _repr(text: str) -> str:
|
||||
"""Return a triple-single-quoted representation of text."""
|
||||
if "'''" not in text:
|
||||
return f"r'''{text}'''"
|
||||
@@ -178,7 +180,7 @@
|
||||
return f"'''{text}'''"
|
||||
|
||||
|
||||
-def setup(app: Sphinx) -> ExtensionMetadata:
|
||||
+def setup(app: Sphinx) -> "ExtensionMetadata":
|
||||
app.add_builder(PydocTopicsBuilder)
|
||||
|
||||
return {
|
||||
|
||||
95
gh126985-mv-pyvenv.cfg2getpath.patch
Normal file
95
gh126985-mv-pyvenv.cfg2getpath.patch
Normal file
@@ -0,0 +1,95 @@
|
||||
commit 2b0e2b2893a821ca36cd65a204bed932741ac189
|
||||
Author: Filipe Laíns 🇵🇸 <lains@riseup.net>
|
||||
Date: Tue Nov 26 13:46:33 2024 +0000
|
||||
|
||||
GH-126985: move pyvenv.cfg detection from site to getpath (#126987)
|
||||
|
||||
---
|
||||
Lib/test/test_sysconfig.py | 67 ---------------------------------------------
|
||||
1 file changed, 1 insertion(+), 66 deletions(-)
|
||||
|
||||
Index: Python-3.13.5/Lib/test/test_sysconfig.py
|
||||
===================================================================
|
||||
--- Python-3.13.5.orig/Lib/test/test_sysconfig.py 2025-06-12 19:55:42.184491497 +0200
|
||||
+++ Python-3.13.5/Lib/test/test_sysconfig.py 2025-06-12 19:56:05.737665419 +0200
|
||||
@@ -110,6 +110,7 @@
|
||||
**venv_create_args,
|
||||
)
|
||||
|
||||
+
|
||||
def test_get_path_names(self):
|
||||
self.assertEqual(get_path_names(), sysconfig._SCHEME_KEYS)
|
||||
|
||||
@@ -604,72 +605,6 @@
|
||||
suffix = sysconfig.get_config_var('EXT_SUFFIX')
|
||||
self.assertTrue(suffix.endswith('-darwin.so'), suffix)
|
||||
|
||||
- @requires_subprocess()
|
||||
- def test_config_vars_depend_on_site_initialization(self):
|
||||
- script = textwrap.dedent("""
|
||||
- import sysconfig
|
||||
-
|
||||
- config_vars = sysconfig.get_config_vars()
|
||||
-
|
||||
- import json
|
||||
- print(json.dumps(config_vars, indent=2))
|
||||
- """)
|
||||
-
|
||||
- with self.venv() as venv:
|
||||
- site_config_vars = json.loads(venv.run('-c', script).stdout)
|
||||
- no_site_config_vars = json.loads(venv.run('-S', '-c', script).stdout)
|
||||
-
|
||||
- self.assertNotEqual(site_config_vars, no_site_config_vars)
|
||||
- # With the site initialization, the virtual environment should be enabled.
|
||||
- self.assertEqual(site_config_vars['base'], venv.prefix)
|
||||
- self.assertEqual(site_config_vars['platbase'], venv.prefix)
|
||||
- #self.assertEqual(site_config_vars['prefix'], venv.prefix) # # FIXME: prefix gets overwriten by _init_posix
|
||||
- # Without the site initialization, the virtual environment should be disabled.
|
||||
- self.assertEqual(no_site_config_vars['base'], site_config_vars['installed_base'])
|
||||
- self.assertEqual(no_site_config_vars['platbase'], site_config_vars['installed_platbase'])
|
||||
-
|
||||
- @requires_subprocess()
|
||||
- def test_config_vars_recalculation_after_site_initialization(self):
|
||||
- script = textwrap.dedent("""
|
||||
- import sysconfig
|
||||
-
|
||||
- before = sysconfig.get_config_vars()
|
||||
-
|
||||
- import site
|
||||
- site.main()
|
||||
-
|
||||
- after = sysconfig.get_config_vars()
|
||||
-
|
||||
- import json
|
||||
- print(json.dumps({'before': before, 'after': after}, indent=2))
|
||||
- """)
|
||||
-
|
||||
- with self.venv() as venv:
|
||||
- config_vars = json.loads(venv.run('-S', '-c', script).stdout)
|
||||
-
|
||||
- self.assertNotEqual(config_vars['before'], config_vars['after'])
|
||||
- self.assertEqual(config_vars['after']['base'], venv.prefix)
|
||||
- #self.assertEqual(config_vars['after']['prefix'], venv.prefix) # FIXME: prefix gets overwriten by _init_posix
|
||||
- #self.assertEqual(config_vars['after']['exec_prefix'], venv.prefix) # FIXME: exec_prefix gets overwriten by _init_posix
|
||||
-
|
||||
- @requires_subprocess()
|
||||
- def test_paths_depend_on_site_initialization(self):
|
||||
- script = textwrap.dedent("""
|
||||
- import sysconfig
|
||||
-
|
||||
- paths = sysconfig.get_paths()
|
||||
-
|
||||
- import json
|
||||
- print(json.dumps(paths, indent=2))
|
||||
- """)
|
||||
-
|
||||
- with self.venv() as venv:
|
||||
- site_paths = json.loads(venv.run('-c', script).stdout)
|
||||
- no_site_paths = json.loads(venv.run('-S', '-c', script).stdout)
|
||||
-
|
||||
- self.assertNotEqual(site_paths, no_site_paths)
|
||||
-
|
||||
-
|
||||
class MakefileTests(unittest.TestCase):
|
||||
|
||||
@unittest.skipIf(sys.platform.startswith('win'),
|
||||
30
gh138131-exclude-pycache-from-digest.patch
Normal file
30
gh138131-exclude-pycache-from-digest.patch
Normal file
@@ -0,0 +1,30 @@
|
||||
From 4bb41b28d5bac09bccd636d8c5fefe1a462f63a7 Mon Sep 17 00:00:00 2001
|
||||
From: Alm <alon.menczer@gmail.com>
|
||||
Date: Mon, 25 Aug 2025 08:56:38 +0300
|
||||
Subject: [PATCH 1/4] Exclude .pyc files from the computed digest in the jit
|
||||
stencils
|
||||
|
||||
---
|
||||
Tools/jit/_targets.py | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
Index: Python-3.13.7/Tools/jit/_targets.py
|
||||
===================================================================
|
||||
--- Python-3.13.7.orig/Tools/jit/_targets.py
|
||||
+++ Python-3.13.7/Tools/jit/_targets.py
|
||||
@@ -53,6 +53,9 @@ class _Target(typing.Generic[_S, _R]):
|
||||
hasher.update(PYTHON_EXECUTOR_CASES_C_H.read_bytes())
|
||||
hasher.update((out / "pyconfig.h").read_bytes())
|
||||
for dirpath, _, filenames in sorted(os.walk(TOOLS_JIT)):
|
||||
+ # Exclude cache files from digest computation to ensure reproducible builds.
|
||||
+ if dirpath.endswith("__pycache__"):
|
||||
+ continue
|
||||
for filename in filenames:
|
||||
hasher.update(pathlib.Path(dirpath, filename).read_bytes())
|
||||
return hasher.hexdigest()
|
||||
Index: Python-3.13.7/Misc/NEWS.d/next/Build/2025-08-27-09-52-45.gh-issue-138061.fMVS9w.rst
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ Python-3.13.7/Misc/NEWS.d/next/Build/2025-08-27-09-52-45.gh-issue-138061.fMVS9w.rst
|
||||
@@ -0,0 +1 @@
|
||||
+Ensure reproducible builds by making JIT stencil header generation deterministic.
|
||||
36
gh139257-Support-docutils-0.22.patch
Normal file
36
gh139257-Support-docutils-0.22.patch
Normal file
@@ -0,0 +1,36 @@
|
||||
From 19b61747df3d62c822285c488753d6fbdf91e3ac Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Garcia Moreno <daniel.garcia@suse.com>
|
||||
Date: Tue, 23 Sep 2025 10:20:16 +0200
|
||||
Subject: [PATCH 1/2] gh-139257: Support docutils >= 0.22
|
||||
|
||||
---
|
||||
Doc/tools/extensions/pyspecific.py | 12 +++++++++++-
|
||||
1 file changed, 11 insertions(+), 1 deletion(-)
|
||||
|
||||
Index: Python-3.13.7/Doc/tools/extensions/pyspecific.py
|
||||
===================================================================
|
||||
--- Python-3.13.7.orig/Doc/tools/extensions/pyspecific.py
|
||||
+++ Python-3.13.7/Doc/tools/extensions/pyspecific.py
|
||||
@@ -25,11 +25,21 @@ from sphinx.util.docutils import SphinxD
|
||||
SOURCE_URI = 'https://github.com/python/cpython/tree/3.13/%s'
|
||||
|
||||
# monkey-patch reST parser to disable alphabetic and roman enumerated lists
|
||||
+def _disable_alphabetic_and_roman(text):
|
||||
+ try:
|
||||
+ # docutils >= 0.22
|
||||
+ from docutils.parsers.rst.states import InvalidRomanNumeralError
|
||||
+ raise InvalidRomanNumeralError(text)
|
||||
+ except ImportError:
|
||||
+ # docutils < 0.22
|
||||
+ return None
|
||||
+
|
||||
+
|
||||
from docutils.parsers.rst.states import Body
|
||||
Body.enum.converters['loweralpha'] = \
|
||||
Body.enum.converters['upperalpha'] = \
|
||||
Body.enum.converters['lowerroman'] = \
|
||||
- Body.enum.converters['upperroman'] = lambda x: None
|
||||
+ Body.enum.converters['upperroman'] = _disable_alphabetic_and_roman
|
||||
|
||||
|
||||
class PyAwaitableMixin(object):
|
||||
@@ -1,16 +1,16 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!-- Copyright 2017 Zbigniew Jędrzejewski-Szmek -->
|
||||
<application>
|
||||
<id type="desktop">idle3.desktop</id>
|
||||
<component type="desktop-application">
|
||||
<id>org.python.IDLE3</id>
|
||||
<launchable type="desktop-id">idle3.desktop</launchable>
|
||||
|
||||
<name>IDLE3</name>
|
||||
<metadata_licence>CC0</metadata_licence>
|
||||
<project_license>Python-2.0</project_license>
|
||||
<summary>Python 3 Integrated Development and Learning Environment</summary>
|
||||
|
||||
<description>
|
||||
<p>
|
||||
IDLE is Python’s Integrated Development and Learning Environment.
|
||||
The GUI is uniform between Windows, Unix, and Mac OS X.
|
||||
The GUI is uniform between Windows, Unix, and macOS.
|
||||
IDLE provides an easy way to start writing, running, and debugging
|
||||
Python code.
|
||||
</p>
|
||||
@@ -19,17 +19,33 @@
|
||||
It provides:
|
||||
</p>
|
||||
<ul>
|
||||
<li>a Python shell window (interactive interpreter) with colorizing of code input, output, and error messages,</li>
|
||||
<li>a multi-window text editor with multiple undo, Python colorizing, smart indent, call tips, auto completion, and other features,</li>
|
||||
<li>search within any window, replace within editor windows, and search through multiple files (grep),</li>
|
||||
<li>a debugger with persistent breakpoints, stepping, and viewing of global and local namespaces.</li>
|
||||
<li>a Python shell window (interactive interpreter) with colorizing of code input, output, and error messages,</li>
|
||||
<li>a multi-window text editor with multiple undo, Python colorizing, smart indent, call tips, auto completion, and other features,</li>
|
||||
<li>search within any window, replace within editor windows, and search through multiple files (grep),</li>
|
||||
<li>a debugger with persistent breakpoints, stepping, and viewing of global and local namespaces.</li>
|
||||
</ul>
|
||||
</description>
|
||||
|
||||
<developer id="org.python">
|
||||
<name>Python Software Foundation</name>
|
||||
</developer>
|
||||
|
||||
<url type="homepage">https://docs.python.org/3/library/idle.html</url>
|
||||
|
||||
<screenshots>
|
||||
<screenshot type="default">http://in.waw.pl/~zbyszek/fedora/idle3-appdata/idle3-main-window.png</screenshot>
|
||||
<screenshot>http://in.waw.pl/~zbyszek/fedora/idle3-appdata/idle3-class-browser.png</screenshot>
|
||||
<screenshot>http://in.waw.pl/~zbyszek/fedora/idle3-appdata/idle3-code-viewer.png</screenshot>
|
||||
<screenshot type="default">
|
||||
<image>https://in.waw.pl/~zbyszek/fedora/idle3-appdata/idle3-main-window.png</image>
|
||||
</screenshot>
|
||||
<screenshot>
|
||||
<image>https://in.waw.pl/~zbyszek/fedora/idle3-appdata/idle3-class-browser.png</image>
|
||||
</screenshot>
|
||||
<screenshot>
|
||||
<image>https://in.waw.pl/~zbyszek/fedora/idle3-appdata/idle3-code-viewer.png</image>
|
||||
</screenshot>
|
||||
</screenshots>
|
||||
|
||||
<project_license>Python-2.0</project_license>
|
||||
<metadata_license>CC0-1.0</metadata_license>
|
||||
<update_contact>zbyszek@in.waw.pl</update_contact>
|
||||
</application>
|
||||
</component>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -1679,11 +1679,18 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
|
||||
@@ -1684,11 +1684,18 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
|
||||
$(DTRACE_OBJS) \
|
||||
$(srcdir)/Modules/getbuildinfo.c
|
||||
$(CC) -c $(PY_CORE_CFLAGS) \
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
Index: Python-3.13.0a3/Lib/site.py
|
||||
===================================================================
|
||||
--- Python-3.13.0a3.orig/Lib/site.py
|
||||
+++ Python-3.13.0a3/Lib/site.py
|
||||
@@ -77,7 +77,7 @@ import io
|
||||
import stat
|
||||
---
|
||||
Lib/site.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/Lib/site.py
|
||||
+++ b/Lib/site.py
|
||||
@@ -78,7 +78,7 @@ import stat
|
||||
import errno
|
||||
|
||||
# Prefixes for site-packages; add additional prefixes like /usr/local here
|
||||
-PREFIXES = [sys.prefix, sys.exec_prefix]
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
---
|
||||
Lib/test/test_posix.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/Lib/test/test_posix.py
|
||||
+++ b/Lib/test/test_posix.py
|
||||
@@ -437,7 +437,7 @@ class PosixTester(unittest.TestCase):
|
||||
def test_posix_fadvise(self):
|
||||
fd = os.open(os_helper.TESTFN, os.O_RDONLY)
|
||||
try:
|
||||
- posix.posix_fadvise(fd, 0, 0, posix.POSIX_FADV_WILLNEED)
|
||||
+ posix.posix_fadvise(fd, 0, 0, posix.POSIX_FADV_RANDOM)
|
||||
finally:
|
||||
os.close(fd)
|
||||
|
||||
1079
python313.changes
1079
python313.changes
File diff suppressed because it is too large
Load Diff
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package python313
|
||||
#
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -83,19 +83,20 @@
|
||||
# No experimental_jit in SLES, there's no clang >=18
|
||||
%if 0%{?suse_version} <= 1600
|
||||
%bcond_with experimental_jit
|
||||
# Disable experimental_jit for primary python.
|
||||
# llvm is not part of ring0 and experimental_jit requires clang >= 18
|
||||
%elif !%{primary_interpreter}
|
||||
# Currently supported architectures
|
||||
# https://peps.python.org/pep-0744/#support
|
||||
%ifarch x86_64 %{x86_64} aarch64
|
||||
%bcond_without experimental_jit
|
||||
%else
|
||||
%bcond_with experimental_jit
|
||||
%endif
|
||||
|
||||
%else
|
||||
%bcond_with experimental_jit
|
||||
# Disable experimental_jit for primary python.
|
||||
# llvm is not part of ring0 and experimental_jit requires clang >= 18
|
||||
%if !%{primary_interpreter}
|
||||
# Currently supported architectures
|
||||
# https://peps.python.org/pep-0744/#support
|
||||
%ifarch x86_64 %{x86_64} aarch64
|
||||
%bcond_without experimental_jit
|
||||
%else
|
||||
%bcond_with experimental_jit
|
||||
%endif
|
||||
%else
|
||||
%bcond_with experimental_jit
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# %%if 0%%{?sle_version} && 0%%{?suse_version} < 1550
|
||||
@@ -139,7 +140,11 @@
|
||||
# version part of "libpython" package
|
||||
%define so_major 1
|
||||
%define so_minor 0
|
||||
%if "%{abi_kind}" == "t"
|
||||
%define so_version %{python_version_soname}t%{so_major}_%{so_minor}
|
||||
%else
|
||||
%define so_version %{python_version_soname}%{abi_kind}-%{so_major}_%{so_minor}
|
||||
%endif
|
||||
# rpm and python have different ideas about what is an arch-dependent name, so:
|
||||
%if "%{__isa_name}" == "ppc"
|
||||
%define archname %(echo %{_arch} | sed s/ppc/powerpc/)
|
||||
@@ -162,7 +167,7 @@
|
||||
# _md5.cpython-38m-x86_64-linux-gnu.so
|
||||
%define dynlib() %{sitedir}/lib-dynload/%{1}.cpython-%{abi_tag}-%{archname}-%{_os}%{?_gnu}%{?armsuffix}.so
|
||||
Name: %{python_pkg_name}%{psuffix}
|
||||
Version: 3.13.2
|
||||
Version: 3.13.9
|
||||
%define tarversion %{version}
|
||||
%define tarname Python-%{tarversion}
|
||||
Release: 0
|
||||
@@ -206,8 +211,6 @@ Patch02: F00251-change-user-install-location.patch
|
||||
Patch03: python-3.3.0b1-localpath.patch
|
||||
# replace DATE, TIME and COMPILER by fixed definitions to aid reproducible builds
|
||||
Patch04: python-3.3.0b1-fix_date_time_compiler.patch
|
||||
# POSIX_FADV_WILLNEED throws EINVAL. Use a different constant in test
|
||||
Patch05: python-3.3.0b1-test-posix_fadvise.patch
|
||||
# Raise timeout value for test_subprocess
|
||||
Patch06: subprocess-raise-timeout.patch
|
||||
# PATCH-FEATURE-UPSTREAM bpo-31046_ensurepip_honours_prefix.patch bpo#31046 mcepl@suse.com
|
||||
@@ -222,6 +225,16 @@ Patch40: fix-test-recursion-limit-15.6.patch
|
||||
# PATCH-FIX-SLE doc-py38-to-py36.patch mcepl@suse.com
|
||||
# Make documentation extensions working with Python 3.6
|
||||
Patch41: doc-py38-to-py36.patch
|
||||
# PATCH-FIX-UPSTREAM gh126985-mv-pyvenv.cfg2getpath.patch mcepl@suse.com
|
||||
# Remove tests failing in test_sysconfig
|
||||
Patch42: gh126985-mv-pyvenv.cfg2getpath.patch
|
||||
# PATCH-FIX-UPSTREAM bsc1243155-sphinx-non-determinism.patch bsc#1243155 mcepl@suse.com
|
||||
# Doc: Generate ids for audit_events using docname
|
||||
Patch43: bsc1243155-sphinx-non-determinism.patch
|
||||
# PATCH-FIX-UPSTREAM gh138131-exclude-pycache-from-digest.patch bsc#1244680 daniel.garcia@suse.com
|
||||
Patch44: gh138131-exclude-pycache-from-digest.patch
|
||||
# PATCH-FIX-OPENSUSE gh139257-Support-docutils-0.22.patch gh#python/cpython#139257 daniel.garcia@suse.com
|
||||
Patch45: gh139257-Support-docutils-0.22.patch
|
||||
BuildRequires: autoconf-archive
|
||||
BuildRequires: automake
|
||||
BuildRequires: fdupes
|
||||
@@ -258,7 +271,9 @@ BuildRequires: python3-Sphinx >= 4.0.0
|
||||
%if 0%{?suse_version} >= 1500
|
||||
BuildRequires: python3-python-docs-theme >= 2022.1
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} < 1599
|
||||
BuildRequires: python3-dataclasses
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
# end of {with doc}
|
||||
@@ -274,8 +289,6 @@ ExcludeArch: aarch64
|
||||
%endif
|
||||
|
||||
%if %{with general}
|
||||
# required for idle3 (.desktop and .appdata.xml files)
|
||||
BuildRequires: appstream-glib
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gdbm-devel
|
||||
BuildRequires: gettext
|
||||
@@ -313,7 +326,7 @@ Installing "python3" is sufficient for the vast majority of usecases.
|
||||
In addition, recommended packages provide UI toolkit support (python3-curses,
|
||||
python3-tk), legacy UNIX database bindings (python3-dbm), and the IDLE
|
||||
development environment (python3-idle).
|
||||
%if %{with GIL}
|
||||
%if %{without GIL}
|
||||
|
||||
This package has been built with the Global Interpreter Lock removed.
|
||||
This feature is still considered to be experimental. This package is
|
||||
@@ -434,7 +447,7 @@ This package contains the interpreter core and most commonly used modules
|
||||
from the standard library. This is sufficient for many usecases, but it
|
||||
excludes components that depend on external libraries, most notably XML,
|
||||
database and UI toolkits support.
|
||||
%if %{with GIL}
|
||||
%if %{without GIL}
|
||||
|
||||
This package has been built with the Global Interpreter Lock removed.
|
||||
This feature is still considered to be experimental. This package is
|
||||
@@ -542,7 +555,7 @@ rm Lib/site-packages/README.txt
|
||||
tar xvf %{SOURCE21}
|
||||
|
||||
# Don't fail on warnings when building documentation
|
||||
# sed -i -e '/^SPHINXERRORHANDLING/s/-W//' Doc/Makefile
|
||||
sed -i -e '/^SPHINXERRORHANDLING/s/--fail-on-warning//' Doc/Makefile
|
||||
|
||||
%build
|
||||
export SUSE_VERSION="0%{?suse_version}"
|
||||
@@ -554,7 +567,7 @@ TODAY_DATE=`date -r %{SOURCE0} "+%%B %%d, %%Y"`
|
||||
|
||||
cd Doc
|
||||
sed -i "s/^today = .*/today = '$TODAY_DATE'/" conf.py
|
||||
%make_build -j1 html
|
||||
%make_build -j1 JOBS=1 html
|
||||
|
||||
# Build also devhelp files
|
||||
sphinx-build -a -b devhelp . build/devhelp
|
||||
@@ -656,12 +669,6 @@ EXCLUDE="$EXCLUDE test_external_inspection test_faulthandler test_os test_posix
|
||||
# done have any such interface breaking the uuid module.
|
||||
EXCLUDE="$EXCLUDE test_uuid"
|
||||
|
||||
# bsc#1195140 and bpo#37169 - test_capi is failing on openSUSE, and not sure why
|
||||
EXCLUDE="$EXCLUDE test_capi"
|
||||
|
||||
# Failing tests on python 3.13
|
||||
EXCLUDE="$EXCLUDE test_regrtest test_sysconfig"
|
||||
|
||||
# Limit virtual memory to avoid spurious failures
|
||||
if test $(ulimit -v) = unlimited || test $(ulimit -v) -gt 10000000; then
|
||||
ulimit -v 11000000 || :
|
||||
@@ -773,7 +780,6 @@ install -m 644 -D -t %{buildroot}%{_datadir}/applications idle%{python_abi}.desk
|
||||
cp %{SOURCE20} idle%{python_abi}.appdata.xml
|
||||
sed -i -e 's:idle3.desktop:idle%{python_abi}.desktop:g' idle%{python_abi}.appdata.xml
|
||||
install -m 644 -D -t %{buildroot}%{_datadir}/metainfo idle%{python_abi}.appdata.xml
|
||||
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/idle%{python_abi}.appdata.xml
|
||||
|
||||
%fdupes %{buildroot}/%{_libdir}/python%{python_abi}
|
||||
%endif
|
||||
|
||||
@@ -1,16 +1,19 @@
|
||||
---
|
||||
Lib/test/test_subprocess.py | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
Lib/test/test_subprocess.py | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/Lib/test/test_subprocess.py
|
||||
+++ b/Lib/test/test_subprocess.py
|
||||
@@ -280,7 +280,8 @@ class ProcessTestCase(BaseTestCase):
|
||||
"time.sleep(3600)"],
|
||||
# Some heavily loaded buildbots (sparc Debian 3.x) require
|
||||
# this much time to start and print.
|
||||
- timeout=3)
|
||||
+ # OBS might require even more
|
||||
+ timeout=10)
|
||||
self.fail("Expected TimeoutExpired.")
|
||||
self.assertEqual(c.exception.output, b'BDFL')
|
||||
@@ -292,7 +292,11 @@ class ProcessTestCase(BaseTestCase):
|
||||
output = subprocess.check_output(
|
||||
[sys.executable, "-c",
|
||||
"import time; time.sleep(3600)"],
|
||||
- timeout=0.1)
|
||||
+ # Some heavily loaded buildbots (sparc Debian 3.x) require
|
||||
+ # this much time to start and print.
|
||||
+ # timeout=3)
|
||||
+ # OBS might require even more
|
||||
+ timeout=10)
|
||||
|
||||
def test_call_kwargs(self):
|
||||
# call() function with keyword args
|
||||
|
||||
Reference in New Issue
Block a user