Update to Python 3.13.0a4

2024-02-16 09:59:14 +01:00 · 2024-02-16 09:59:14 +01:00 · 1ac5b6981e
commit 1ac5b6981e
parent 08e077563c
5 changed files with 20 additions and 59 deletions
--- a/00251-change-user-install-location.patch
+++ b/00251-change-user-install-location.patch
@ -130,7 +130,7 @@ index 07ab27c7fb..d3e22762bf 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 be609a0abd..8269f48c6d 100644
+index bb87bf00dc..0717f44cb0 100644
 --- a/Lib/test/test_sysconfig.py
 +++ b/Lib/test/test_sysconfig.py
@@ -115,8 +115,19 @@ def test_get_path(self):
@ -154,7 +154,7 @@ index be609a0abd..8269f48c6d 100644
                     os.path.normpath(expected),
                 )
 
-@@ -340,7 +351,7 @@ def test_get_config_h_filename(self):
+@@ -349,7 +360,7 @@ def test_get_config_h_filename(self):
         self.assertTrue(os.path.isfile(config_h), config_h)
 
     def test_get_scheme_names(self):
@ -163,7 +163,7 @@ index be609a0abd..8269f48c6d 100644
         if HAS_USER_BASE:
             wanted.extend(['nt_user', 'osx_framework_user', 'posix_user'])
         self.assertEqual(get_scheme_names(), tuple(sorted(wanted)))
-@@ -352,6 +363,8 @@ def test_symlink(self): # Issue 7880
+@@ -361,6 +372,8 @@ def test_symlink(self): # Issue 7880
             cmd = "-c", "import sysconfig; print(sysconfig.get_platform())"
             self.assertEqual(py.call_real(*cmd), py.call_link(*cmd))
 
--- a/00371-revert-bpo-1596321-fix-threading-_shutdown-for-the-main-thread-gh-28549-gh-28589.patch
+++ b/00371-revert-bpo-1596321-fix-threading-_shutdown-for-the-main-thread-gh-28549-gh-28589.patch
@ -16,10 +16,10 @@ https://github.com/GrahamDumpleton/mod_wsgi/issues/730
 2 files changed, 11 insertions(+), 53 deletions(-)

 diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
-index 3060af44fd..4c7afe648d 100644
+index 1ab223b81e..727b2b0c43 100644
 --- a/Lib/test/test_threading.py
 +++ b/Lib/test/test_threading.py
-@@ -1056,39 +1056,6 @@ def noop(): pass
+@@ -1169,39 +1169,6 @@ def noop(): pass
             threading.Thread(target=noop).start()
             # Thread.join() is not called
 
@ -60,10 +60,10 @@ index 3060af44fd..4c7afe648d 100644
         code = """if 1:
             import atexit
 diff --git a/Lib/threading.py b/Lib/threading.py
-index 85aff58968..746c409c63 100644
+index b6ff00acad..0447c3ee54 100644
 --- a/Lib/threading.py
 +++ b/Lib/threading.py
-@@ -1616,32 +1616,23 @@ def _shutdown():
+@@ -1652,32 +1652,23 @@ def _shutdown():
 
     global _SHUTTING_DOWN
     _SHUTTING_DOWN = True
--- a/00418-don-t-generate-sbom-in-make-regen-all.patch
+++ b/00418-don-t-generate-sbom-in-make-regen-all.patch
@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Karolina Surma <ksurma@redhat.com>
-Date: Fri, 19 Jan 2024 12:00:18 +0100
-Subject: [PATCH] 00418: Don't generate sbom in make regen-all
-
-The script and make target, added in Python 3.13.0a3, assumes a fixed
-location of pip wheel and other bundled libraries, resulting in an
-error and failed build when not found.
-Reported upstream: https://github.com/python/cpython/issues/114240
-and https://github.com/python/cpython/issues/114244
---
- Makefile.pre.in | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 289ab97666..1058fac8cc 100644
--- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1364,10 +1364,11 @@ regen-unicodedata:
- regen-all: regen-cases regen-typeslots \
- 	regen-token regen-ast regen-keyword regen-sre regen-frozen \
- 	regen-pegen-metaparser regen-pegen regen-test-frozenmain \
-	regen-test-levenshtein regen-global-objects regen-sbom
-+	regen-test-levenshtein regen-global-objects
- 	@echo
- 	@echo "Note: make regen-stdlib-module-names, make regen-limited-abi, "
-	@echo "make regen-configure and make regen-unicodedata should be run manually"
-+	@echo "make regen-configure, make regen-unicodedata and make regen-sbom "
-+	@echo "should be run manually"
- 
- ############################################################################
- # Special rules for object files
--- a/python3.13.spec
+++ b/python3.13.spec
@ -14,10 +14,10 @@ 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 a3
+%global prerel a4
 %global upstream_version %{general_version}%{?prerel}
 Version: %{general_version}%{?prerel:~%{prerel}}
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: Python-2.0.1


@ -73,7 +73,7 @@ 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 23.3.2
+%global pip_version 24.0
 %global setuptools_version 67.6.1
 %global wheel_version 0.40.0
 # All of those also include a list of indirect bundled libs:
@ -84,7 +84,7 @@ Provides: bundled(python3dist(cachecontrol)) = 0.13.1
 Provides: bundled(python3dist(certifi)) = 2023.7.22
 Provides: bundled(python3dist(chardet)) = 5.1
 Provides: bundled(python3dist(colorama)) = 0.4.6
-Provides: bundled(python3dist(distlib)) = 0.3.6
+Provides: bundled(python3dist(distlib)) = 0.3.8
 Provides: bundled(python3dist(distro)) = 1.8
 Provides: bundled(python3dist(idna)) = 3.4
 Provides: bundled(python3dist(msgpack)) = 1.0.5
@ -124,7 +124,7 @@ Provides: bundled(python3dist(typing-extensions)) = 4.4
 Provides: bundled(python3dist(zipp)) = 3.7
 }
 # wheel
-#  $ %%{_rpmconfigdir}/pythonbundles.py <(unzip -p Lib/test/wheel-*.whl wheel/vendored/vendor.txt)
+#  $ %%{_rpmconfigdir}/pythonbundles.py <(unzip -p Lib/test/wheeldata/wheel-*.whl wheel/vendored/vendor.txt)
 %global wheel_bundled_provides %{expand:
 Provides: bundled(python3dist(packaging)) = 23
 }
@ -385,16 +385,6 @@ Patch251: 00251-change-user-install-location.patch
 # https://github.com/GrahamDumpleton/mod_wsgi/issues/730
 Patch371: 00371-revert-bpo-1596321-fix-threading-_shutdown-for-the-main-thread-gh-28549-gh-28589.patch

-# 00418 # 7044fbb05d0825f5fd9733a6491bb5bea904fab1
-# Don't generate sbom in make regen-all
-#
-# The script and make target, added in Python 3.13.0a3, assumes a fixed
-# location of pip wheel and other bundled libraries, resulting in an
-# error and failed build when not found.
-# Reported upstream: https://github.com/python/cpython/issues/114240
-# and https://github.com/python/cpython/issues/114244
-Patch418: 00418-don-t-generate-sbom-in-make-regen-all.patch
-
 # (New patches go here ^^^)
 #
 # When adding new patches to "python" and "python3" in Fedora, EL, etc.,
@ -768,13 +758,13 @@ extension modules.
 # setuptools.whl does not contain the vendored.txt files
 if [ -f %{_rpmconfigdir}/pythonbundles.py ]; then
  %{_rpmconfigdir}/pythonbundles.py <(unzip -p Lib/ensurepip/_bundled/pip-*.whl pip/_vendor/vendor.txt) --compare-with '%pip_bundled_provides'
-  %{_rpmconfigdir}/pythonbundles.py <(unzip -p Lib/test/wheel-*.whl wheel/vendored/vendor.txt) --compare-with '%wheel_bundled_provides'
+  %{_rpmconfigdir}/pythonbundles.py <(unzip -p Lib/test/wheeldata/wheel-*.whl wheel/vendored/vendor.txt) --compare-with '%wheel_bundled_provides'
 fi

 %if %{with rpmwheels}
 rm Lib/ensurepip/_bundled/pip-%{pip_version}-py3-none-any.whl
-rm Lib/test/setuptools-%{setuptools_version}-py3-none-any.whl
-rm Lib/test/wheel-%{wheel_version}-py3-none-any.whl
+rm Lib/test/wheeldata/setuptools-%{setuptools_version}-py3-none-any.whl
+rm Lib/test/wheeldata/wheel-%{wheel_version}-py3-none-any.whl
 %endif

 # Remove all exe files to ensure we are not shipping prebuilt binaries
@ -1678,6 +1668,9 @@ CheckPython freethreading
 # ======================================================

 %changelog
+* Fri Feb 16 2024 Karolina Surma <ksurma@redhat.com> - 3.13.0~a4-1
+- Update to Python 3.13.0a4
+
 * Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.13.0~a3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (Python-3.13.0a3.tar.xz) = 0cabe30ca97f89df7da35684dda9ac8a3018fb7547d97f595e7883323809fdb99ff02c48719d71fb12abdacda1fc86f0ca15b1d27717e941cdc0b31c72fd63bb
-SHA512 (Python-3.13.0a3.tar.xz.asc) = 91efe8e66085e4b60b565130a8ab43b3772e3dafe25fa6266900a8c19004082bcfd7e72e6e5293dc5bc3330ea2db233365d1028ef3b86ee4bb7df1246b6641b0
+SHA512 (Python-3.13.0a4.tar.xz) = f0dccc822ba000e8a50853d62698975d35382b981b62091e25ad6a6e0669e4e517c880e884644b508172de38226006ec11ddc649d9271320e728c0cd6c0b4dcc
+SHA512 (Python-3.13.0a4.tar.xz.asc) = 261c0b23f84301f8b2aa4e8ea32995ea64a74a48dabc595028af71466915df93c118e699c939d7e4372d4575c59221743cb5ae21a936cc41241bdbafb9fab6c3