diff --git a/00251-change-user-install-location.patch b/00251-change-user-install-location.patch index cd0aa2f..1381023 100644 --- a/00251-change-user-install-location.patch +++ b/00251-change-user-install-location.patch @@ -30,10 +30,10 @@ Co-authored-by: Lumír Balhar 3 files changed, 72 insertions(+), 4 deletions(-) diff --git a/Lib/site.py b/Lib/site.py -index b63447d667..2476b1a484 100644 +index 7eace190f5..8d193abfbb 100644 --- a/Lib/site.py +++ b/Lib/site.py -@@ -404,8 +404,15 @@ def getsitepackages(prefixes=None): +@@ -406,8 +406,15 @@ def getsitepackages(prefixes=None): return sitepackages def addsitepackages(known_paths, prefixes=None): diff --git a/00428-gh-118846-fix-pgo-tests-in-free-threaded-build.patch b/00428-gh-118846-fix-pgo-tests-in-free-threaded-build.patch deleted file mode 100644 index b56a0f6..0000000 --- a/00428-gh-118846-fix-pgo-tests-in-free-threaded-build.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Sam Gross -Date: Thu, 9 May 2024 16:06:20 -0400 -Subject: [PATCH] 00428: gh-118846: Fix PGO tests in free-threaded build - -Avoid immortalizing objects in tests that verify garbage collection of -classes or modules. - -This fixes test_ordered_dict and test_struct. - -(cherry picked from commit 1b1db2fd9a531e26b79b34667bccfb938c4d184d) ---- - Lib/test/test_ordered_dict.py | 3 ++- - Lib/test/test_struct.py | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/Lib/test/test_ordered_dict.py b/Lib/test/test_ordered_dict.py -index 4571b23dfe..06a0e81227 100644 ---- a/Lib/test/test_ordered_dict.py -+++ b/Lib/test/test_ordered_dict.py -@@ -10,7 +10,7 @@ - import weakref - from collections.abc import MutableMapping - from test import mapping_tests, support --from test.support import import_helper -+from test.support import import_helper, suppress_immortalization - - - py_coll = import_helper.import_fresh_module('collections', -@@ -667,6 +667,7 @@ def test_dict_update(self): - dict.update(od, [('spam', 1)]) - self.assertNotIn('NULL', repr(od)) - -+ @suppress_immortalization() - def test_reference_loop(self): - # Issue 25935 - OrderedDict = self.OrderedDict -diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py -index 15f6ee06ff..5508cc3eec 100644 ---- a/Lib/test/test_struct.py -+++ b/Lib/test/test_struct.py -@@ -9,7 +9,7 @@ - import weakref - - from test import support --from test.support import import_helper -+from test.support import import_helper, suppress_immortalization - from test.support.script_helper import assert_python_ok - - ISBIGENDIAN = sys.byteorder == "big" -@@ -674,6 +674,7 @@ def __del__(self): - self.assertIn(b"Exception ignored in:", stderr) - self.assertIn(b"C.__del__", stderr) - -+ @suppress_immortalization() - def test__struct_reference_cycle_cleaned_up(self): - # Regression test for python/cpython#94207. - diff --git a/python3.13.spec b/python3.13.spec index 4bfe050..4e7e73d 100644 --- a/python3.13.spec +++ b/python3.13.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 b1 +%global prerel b2 %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} Release: 1%{?dist} @@ -378,15 +378,6 @@ Source11: idle3.appdata.xml # pypa/distutils integration: https://github.com/pypa/distutils/pull/70 Patch251: 00251-change-user-install-location.patch -# 00428 # 8c674ea0d9368e1b239bc9c7ee6044d925e252a4 -# gh-118846: Fix PGO tests in free-threaded build -# -# Avoid immortalizing objects in tests that verify garbage collection of -# classes or modules. -# -# This fixes test_ordered_dict and test_struct. -Patch428: 00428-gh-118846-fix-pgo-tests-in-free-threaded-build.patch - # (New patches go here ^^^) # # When adding new patches to "python" and "python3" in Fedora, EL, etc., @@ -1695,6 +1686,9 @@ CheckPython freethreading # ====================================================== %changelog +* Wed Jun 05 2024 Miro Hrončok - 3.13.0~b2-1 +- Update to Python 3.13.0b2 + * Thu May 09 2024 Karolina Surma - 3.13.0~b1-1 - Update to Python 3.13.0b1 diff --git a/sources b/sources index f78212a..2ac030e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (Python-3.13.0b1.tar.xz) = 81cc1d8691bfcc8f8bb232ea15c18039d0df036f5cbc1667fec3b6c34cdf198bed97418ec775c037778c250b7bc4f35bd5fb938dd478cc17fc48c74b8a2b2d19 -SHA512 (Python-3.13.0b1.tar.xz.asc) = c10832b5016ad9a9588b7efd29a35272c1c07b444df116c397fed82d66f30150687d68a6853637094be2fe1d8ed0928a9cd151617c91d9eb9938ba1385bd7143 +SHA512 (Python-3.13.0b2.tar.xz) = 3a37c8137958a6ebaf06f5a03b28c7817f359f346d820a9989932b1a716478647e8d1b94c1a08197bcabf68cd90443a08ab9454af9151eace52401d8b60d0c35 +SHA512 (Python-3.13.0b2.tar.xz.asc) = 17091aba45ebd8c8feb3e9c54854e20dcd44fec4a1c08c9c0c4593166c407c4ad2b245a0e0893afc83a43e8b461a557fa1d6691c87a6a5ebc97ea448a9201c87