From ee3b609ce717e6fb876293bd4c90791cdfb0f102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= Date: Wed, 9 Apr 2025 09:54:51 +0200 Subject: [PATCH] Update to 3.13.3 --- 00251-change-user-install-location.patch | 6 +-- ...oken-rst-with-rstfile-as-an-argument.patch | 24 ++++++++++++ ...ame-in-test_group_no_follow_symlinks.patch | 24 ++++++++++++ python3.13.spec | 37 +++++++++++++------ sources | 4 +- 5 files changed, 79 insertions(+), 16 deletions(-) create mode 100644 00454-invoke-regen-token-rst-with-rstfile-as-an-argument.patch create mode 100644 00456-find-the-correct-group-name-in-test_group_no_follow_symlinks.patch diff --git a/00251-change-user-install-location.patch b/00251-change-user-install-location.patch index a3a121d..8f0a321 100644 --- a/00251-change-user-install-location.patch +++ b/00251-change-user-install-location.patch @@ -51,7 +51,7 @@ index 89a81c55cb..950e2e337f 100644 if os.path.isdir(sitedir): addsitedir(sitedir, known_paths) diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py -index ec3b638f00..94a6c64aa2 100644 +index 510c7b9568..6e4e07e43b 100644 --- a/Lib/sysconfig/__init__.py +++ b/Lib/sysconfig/__init__.py @@ -106,6 +106,12 @@ @@ -87,7 +87,7 @@ index ec3b638f00..94a6c64aa2 100644 _SCHEME_KEYS = ('stdlib', 'platstdlib', 'purelib', 'platlib', 'include', 'scripts', 'data') -@@ -259,11 +278,40 @@ def _extend_dict(target_dict, other_dict): +@@ -266,11 +285,40 @@ def _extend_dict(target_dict, other_dict): target_dict[key] = value @@ -130,7 +130,7 @@ index ec3b638f00..94a6c64aa2 100644 # On Windows we want to substitute 'lib' for schemes rather # than the native value (without modifying vars, in case it diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py -index bf53413021..33fa2feb28 100644 +index aca02c06bc..a4d0db0da8 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py @@ -130,8 +130,19 @@ def test_get_path(self): diff --git a/00454-invoke-regen-token-rst-with-rstfile-as-an-argument.patch b/00454-invoke-regen-token-rst-with-rstfile-as-an-argument.patch new file mode 100644 index 0000000..4e736ef --- /dev/null +++ b/00454-invoke-regen-token-rst-with-rstfile-as-an-argument.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Karolina Surma +Date: Wed, 9 Apr 2025 10:47:48 +0200 +Subject: [PATCH] 00454: Invoke regen-token rst with rstfile as an argument + +Proposed upstream: https://github.com/python/cpython/pull/132304 +--- + Makefile.pre.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index 3bd4495f95..d7a4e4b320 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -1784,7 +1784,8 @@ regen-token: + # using Tools/build/generate_token.py + $(PYTHON_FOR_REGEN) $(srcdir)/Tools/build/generate_token.py rst \ + $(srcdir)/Grammar/Tokens \ +- $(srcdir)/Doc/library/token-list.inc ++ $(srcdir)/Doc/library/token-list.inc \ ++ $(srcdir)/Doc/library/token.rst + # Regenerate Include/internal/pycore_token.h from Grammar/Tokens + # using Tools/build/generate_token.py + $(PYTHON_FOR_REGEN) $(srcdir)/Tools/build/generate_token.py h \ diff --git a/00456-find-the-correct-group-name-in-test_group_no_follow_symlinks.patch b/00456-find-the-correct-group-name-in-test_group_no_follow_symlinks.patch new file mode 100644 index 0000000..0dd171e --- /dev/null +++ b/00456-find-the-correct-group-name-in-test_group_no_follow_symlinks.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Karolina Surma +Date: Thu, 10 Apr 2025 15:11:41 +0200 +Subject: [PATCH] 00456: Find the correct group name in + test_group_no_follow_symlinks + +Proposed upstream: https://github.com/python/cpython/pull/132357 +--- + Lib/test/test_pathlib/test_pathlib.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Lib/test/test_pathlib/test_pathlib.py b/Lib/test/test_pathlib/test_pathlib.py +index 1f01ce40da..2b9aad1426 100644 +--- a/Lib/test/test_pathlib/test_pathlib.py ++++ b/Lib/test/test_pathlib/test_pathlib.py +@@ -781,7 +781,7 @@ def test_group_no_follow_symlinks(self): + os.chown(link, -1, gid_2, follow_symlinks=False) + + expected_gid = link.stat(follow_symlinks=False).st_gid +- expected_name = self._get_pw_name_or_skip_test(expected_gid) ++ expected_name = self._get_gr_name_or_skip_test(expected_gid) + + self.assertEqual(expected_gid, gid_2) + self.assertEqual(expected_name, link.group(follow_symlinks=False)) diff --git a/python3.13.spec b/python3.13.spec index 0912d12..6dbc504 100644 --- a/python3.13.spec +++ b/python3.13.spec @@ -13,11 +13,11 @@ URL: https://www.python.org/ # WARNING When rebasing to a new Python version, # remember to update the python3-docs package as well -%global general_version %{pybasever}.2 +%global general_version %{pybasever}.3 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 1%{?dist} License: Python-2.0.1 @@ -57,28 +57,28 @@ License: Python-2.0.1 # This needs to be manually updated when we update Python. # Explore the sources tarball (you need the version before %%prep is executed): # $ tar -tf Python-%%{upstream_version}.tar.xz | grep whl -%global pip_version 24.3.1 +%global pip_version 25.0.1 %global setuptools_version 67.6.1 %global wheel_version 0.43.0 # All of those also include a list of indirect bundled libs: # pip # $ %%{_rpmconfigdir}/pythonbundles.py <(unzip -p Lib/ensurepip/_bundled/pip-*.whl pip/_vendor/vendor.txt) %global pip_bundled_provides %{expand: -Provides: bundled(python3dist(cachecontrol)) = 0.14 +Provides: bundled(python3dist(cachecontrol)) = 0.14.1 Provides: bundled(python3dist(certifi)) = 2024.8.30 Provides: bundled(python3dist(distlib)) = 0.3.9 Provides: bundled(python3dist(distro)) = 1.9 -Provides: bundled(python3dist(idna)) = 3.7 -Provides: bundled(python3dist(msgpack)) = 1.0.8 -Provides: bundled(python3dist(packaging)) = 24.1 -Provides: bundled(python3dist(platformdirs)) = 4.2.2 +Provides: bundled(python3dist(idna)) = 3.10 +Provides: bundled(python3dist(msgpack)) = 1.1 +Provides: bundled(python3dist(packaging)) = 24.2 +Provides: bundled(python3dist(platformdirs)) = 4.3.6 Provides: bundled(python3dist(pygments)) = 2.18 -Provides: bundled(python3dist(pyproject-hooks)) = 1 +Provides: bundled(python3dist(pyproject-hooks)) = 1.2 Provides: bundled(python3dist(requests)) = 2.32.3 Provides: bundled(python3dist(resolvelib)) = 1.0.1 -Provides: bundled(python3dist(rich)) = 13.7.1 +Provides: bundled(python3dist(rich)) = 13.9.4 Provides: bundled(python3dist(setuptools)) = 70.3 -Provides: bundled(python3dist(tomli)) = 2.0.1 +Provides: bundled(python3dist(tomli)) = 2.2.1 Provides: bundled(python3dist(truststore)) = 0.10 Provides: bundled(python3dist(typing-extensions)) = 4.12.2 Provides: bundled(python3dist(urllib3)) = 1.26.20 @@ -358,6 +358,18 @@ Source11: idle3.appdata.xml # pypa/distutils integration: https://github.com/pypa/distutils/pull/70 Patch251: 00251-change-user-install-location.patch +# 00454 # 1d5d7e9ce724fbbd89645d637303d12731c2a622 +# Invoke regen-token rst with rstfile as an argument +# +# Proposed upstream: https://github.com/python/cpython/pull/132304 +Patch454: 00454-invoke-regen-token-rst-with-rstfile-as-an-argument.patch + +# 00456 # 8f50cf7170e39c02d52cb5f99d647eeefad2f685 +# Find the correct group name in test_group_no_follow_symlinks +# +# Proposed upstream: https://github.com/python/cpython/pull/132357 +Patch456: 00456-find-the-correct-group-name-in-test_group_no_follow_symlinks.patch + # (New patches go here ^^^) # # When adding new patches to "python" and "python3" in Fedora, EL, etc., @@ -1711,6 +1723,9 @@ CheckPython freethreading # ====================================================== %changelog +* Wed Apr 09 2025 Tomáš Hrnčiar - 3.13.3-1 +- Update to 3.13.1 + * Thu Feb 06 2025 Miro Hrončok - 3.13.2-2 - Rebuilt with mpdecimal 4.0.0 diff --git a/sources b/sources index e4c65e5..f101eff 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (Python-3.13.2.tar.xz) = bb1c0598914c6d4326554faa568f660f10b20c701d0f36bf1fa58837b6498d728a407416b06ede39604caea1ca93f60545b83b01ae8ee65f55d4cc83242b63fe -SHA512 (Python-3.13.2.tar.xz.asc) = 5f019be530f688b0adf5d5cc9f2c2243e2f1dc7338559db14c1eedd12aadc85404d42c7aafd74e41828205d85f13f278876662ac30c8f3382a1ee081ba5f29f2 +SHA512 (Python-3.13.3.tar.xz) = f7559b6dceae69f48742af0a6497fbec42cd1e5304f64b6eb9d89222a1171ccf12fa186cc0decabb4e98d05223184967a4a7537754c01083dacdc9073cb1a578 +SHA512 (Python-3.13.3.tar.xz.asc) = 54f8da5f4a4dcadc9830cb07aecf695a26a2de48ab98e1f42b09fdde1c70989476d07ce7ea81337216f1e5fcbf6b688e0608c88a2545ced416b01640108e94db