From 608ee6ea090483c2eaa66f88720723bb17bb096a Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Tue, 8 Apr 2025 17:15:11 +0200 Subject: [PATCH] Update to Python 3.14.0a7 --- 00251-change-user-install-location.patch | 2 +- ...oken-rst-with-rstfile-as-an-argument.patch | 24 ++++++++++++++++++ ...ame-in-test_group_no_follow_symlinks.patch | 25 +++++++++++++++++++ python3.14.spec | 19 +++++++++++++- sources | 2 +- tests/tests.yml | 5 ++-- 6 files changed, 72 insertions(+), 5 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 be55264..5283ffb 100644 --- a/00251-change-user-install-location.patch +++ b/00251-change-user-install-location.patch @@ -130,7 +130,7 @@ index 18e6b8d25e..42df12fad4 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 3738914cf1..98da62ff05 100644 +index cc11eade2e..b4f8aabaef 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py @@ -131,8 +131,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..a456192 --- /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 e10c78d640..5dfde4efcb 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -1960,7 +1960,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..3ef6e55 --- /dev/null +++ b/00456-find-the-correct-group-name-in-test_group_no_follow_symlinks.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Karolina Surma +Date: Thu, 10 Apr 2025 13:46:25 +0200 +Subject: [PATCH] 00456: Find the correct group name in + test_group_no_follow_symlinks + +Reported: https://github.com/python/cpython/issues/132356 +Fix 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 b1fcc5f6f0..3cfffc6311 100644 +--- a/Lib/test/test_pathlib/test_pathlib.py ++++ b/Lib/test/test_pathlib/test_pathlib.py +@@ -2065,7 +2065,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.14.spec b/python3.14.spec index 244a138..ac88f05 100644 --- a/python3.14.spec +++ b/python3.14.spec @@ -14,7 +14,7 @@ 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}.0 -%global prerel a6 +%global prerel a7 %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} Release: 1%{?dist} @@ -351,6 +351,19 @@ 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 +# +# Reported: https://github.com/python/cpython/issues/132356 +# Fix 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., @@ -1406,6 +1419,7 @@ CheckPython freethreading %{1}/_elementtree.%{2}.so\ %{1}/_hashlib.%{2}.so\ %{1}/_heapq.%{2}.so\ +%{1}/_hmac.%{2}.so\ %{1}/_interpchannels.%{2}.so\ %{1}/_interpqueues.%{2}.so\ %{1}/_interpreters.%{2}.so\ @@ -1698,6 +1712,9 @@ CheckPython freethreading # ====================================================== %changelog +* Tue Apr 08 2025 Karolina Surma - 3.14.0~a7-1 +- Update to Python 3.14.0a7 + * Mon Mar 17 2025 Karolina Surma - 3.14.0~a6-1 - Update to Python 3.14.0a6 diff --git a/sources b/sources index a424a41..e82978e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Python-3.14.0a6.tar.xz) = 0fca503199bed0744139823aaf3ead30d7876556750b476fa6e1f701ae71fa7fe333cd46c775929c26729cf71bef6ba545fdc0118a0efca17c2434de3cadabe1 +SHA512 (Python-3.14.0a7.tar.xz) = f7e50c201cb1bbc4779d898e65408147637de7b9d9d85a2e6ad4f8dda758ec150dfb95ee1f12c686a3f46c29a986a75b45323bcbab87b81b319d91236989f6b0 diff --git a/tests/tests.yml b/tests/tests.yml index b1255ce..8db7040 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -30,11 +30,12 @@ run: "PYTHON=python{{ pybasever }}d TOX=false VERSION={{ pybasever }} CYTHON=false ./venv.sh" - selftest: dir: python/selftest - run: "VERSION={{ pybasever }} X='-i test_check_probes -i test_sysconfigdata_json' ./parallel.sh" + # test_data_offset_with_exe_prepended and test_data_offset_with_exe_prepended_zip64: https://github.com/python/cpython/issues/84481 + run: "VERSION={{ pybasever }} X='-i test_check_probes -i test_sysconfigdata_json -i test_data_offset_with_exe_prepended -i test_data_offset_with_exe_prepended_zip64' ./parallel.sh" - debugtest: dir: python/selftest # test_base_interpreter: https://github.com/python/cpython/issues/131372 - run: "VERSION={{ pybasever }} PYTHON=python{{ pybasever }}d X='-i test_check_probes -i test_sysconfigdata_json -i test_base_interpreter' ./parallel.sh" + run: "VERSION={{ pybasever }} PYTHON=python{{ pybasever }}d X='-i test_check_probes -i test_sysconfigdata_json -i test_base_interpreter -i test_data_offset_with_exe_prepended -i test_data_offset_with_exe_prepended_zip64' ./parallel.sh" - optimizedflags: dir: python/flags run: "python{{ pybasever }} ./assertflags.py -O3 CFLAGS PY_BUILTIN_MODULE_CFLAGS PY_CFLAGS PY_CORE_CFLAGS PY_CFLAGS_NODIST PY_STDMODULE_CFLAGS"