From e200f570e4c0950b3ea69aa6cb6d33375bb4f97a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 12 Jul 2021 00:27:27 +0200 Subject: [PATCH 1/8] Update to 3.10.0b4 - patch 363 was a backport - bundled pip was updated to 21.1.3 --- ...importlib-test_entry_points_by_index.patch | 36 ------------------- python3.10.spec | 15 +++----- sources | 4 +-- 3 files changed, 7 insertions(+), 48 deletions(-) delete mode 100644 00363-reset-deprecationwarning-filters-in-test_importlib-test_entry_points_by_index.patch diff --git a/00363-reset-deprecationwarning-filters-in-test_importlib-test_entry_points_by_index.patch b/00363-reset-deprecationwarning-filters-in-test_importlib-test_entry_points_by_index.patch deleted file mode 100644 index 62feb1c..0000000 --- a/00363-reset-deprecationwarning-filters-in-test_importlib-test_entry_points_by_index.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Fri, 18 Jun 2021 15:16:04 +0200 -Subject: [PATCH] 00363: Reset DeprecationWarning filters in - test_importlib.test_entry_points_by_index - -This avoids StopIteration error when running tests. - -https://bugs.python.org/issue44451 ---- - Lib/test/test_importlib/test_metadata_api.py | 1 + - .../NEWS.d/next/Tests/2021-06-18-15-19-35.bpo-44451.aj5pqE.rst | 3 +++ - 2 files changed, 4 insertions(+) - create mode 100644 Misc/NEWS.d/next/Tests/2021-06-18-15-19-35.bpo-44451.aj5pqE.rst - -diff --git a/Lib/test/test_importlib/test_metadata_api.py b/Lib/test/test_importlib/test_metadata_api.py -index 3506493463..2bfc44b18e 100644 ---- a/Lib/test/test_importlib/test_metadata_api.py -+++ b/Lib/test/test_importlib/test_metadata_api.py -@@ -139,6 +139,7 @@ def test_entry_points_by_index(self): - """ - eps = distribution('distinfo-pkg').entry_points - with warnings.catch_warnings(record=True) as caught: -+ warnings.filterwarnings("default", category=DeprecationWarning) - eps[0] - - # check warning -diff --git a/Misc/NEWS.d/next/Tests/2021-06-18-15-19-35.bpo-44451.aj5pqE.rst b/Misc/NEWS.d/next/Tests/2021-06-18-15-19-35.bpo-44451.aj5pqE.rst -new file mode 100644 -index 0000000000..0f635cfe18 ---- /dev/null -+++ b/Misc/NEWS.d/next/Tests/2021-06-18-15-19-35.bpo-44451.aj5pqE.rst -@@ -0,0 +1,3 @@ -+Reset ``DeprecationWarning`` filters in -+``test.test_importlib.test_metadata_api.APITests.test_entry_points_by_index`` -+to avoid ``StopIteration`` error if ``DeprecationWarnings`` are ignored. diff --git a/python3.10.spec b/python3.10.spec index 7bd28a1..fd29dad 100644 --- a/python3.10.spec +++ b/python3.10.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 b3 +%global prerel b4 %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} Release: 1%{?dist} @@ -68,7 +68,7 @@ License: Python # If the rpmwheels condition is disabled, we use the bundled wheel packages # from Python with the versions below. # This needs to be manually updated when we update Python. -%global pip_version 21.1.1 +%global pip_version 21.1.3 %global setuptools_version 56.0.0 # Expensive optimizations (mainly, profile-guided optimizations) @@ -292,14 +292,6 @@ Patch251: 00251-change-user-install-location.patch # Ideally, we should talk to upstream and explain why we don't want this Patch328: 00328-pyc-timestamp-invalidation-mode.patch -# 00363 # bcb4a805ad54d3a810fb54582e67c5f5fe6d9773 -# Reset DeprecationWarning filters in test_importlib.test_entry_points_by_index -# -# This avoids StopIteration error when running tests. -# -# https://bugs.python.org/issue44451 -Patch363: 00363-reset-deprecationwarning-filters-in-test_importlib-test_entry_points_by_index.patch - # (New patches go here ^^^) # # When adding new patches to "python" and "python3" in Fedora, EL, etc., @@ -1586,6 +1578,9 @@ CheckPython optimized # ====================================================== %changelog +* Sun Jul 11 2021 Miro Hrončok - 3.10.0~b4-1 +- Update to 3.10.0b4 + * Thu Jun 17 2021 Miro Hrončok - 3.10.0~b3-1 - Update to 3.10.0b3 diff --git a/sources b/sources index ef907d3..9fc0481 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (Python-3.10.0b3.tar.xz) = ef0dc5eddb5f9702ab88faa2827455347caa81ab6c03192d6e37c968a40c53ab485d5c923905c511d19bc35e10129aa302f6733e0a7d296da8f725367dd1b258 -SHA512 (Python-3.10.0b3.tar.xz.asc) = 6b8d2caf753f0d92019e18d1441e323a44aff06ee8bdc272572a67359dc4bece833db56b9318c91962d39ee4d09bf701b548d71ae02c4b64f3c21f1c23ed1d36 +SHA512 (Python-3.10.0b4.tar.xz) = deb5ce510c381ce7fcdc7056754b3afccdbc4610cb77b85115859a5e636065584f517e0931a31f77723c09229b2fd751011b1cf16967c075f629018f0a7975a4 +SHA512 (Python-3.10.0b4.tar.xz.asc) = 55ef4265d9217f35e5f1da3b8b560f711c3f118230ff5fb7fe3ab5e189c22c331cecb9783465234ac0df8a1e075887b5fedfbc181cab6e571e5e2f8403d9720d From 0f2ca3b254c66903eaf6abf0e1624d583576fa40 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Fri, 16 Jul 2021 09:49:45 +0000 Subject: [PATCH 2/8] Provide python3-turtle from python3-tkinter Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1952565 --- python3.10.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/python3.10.spec b/python3.10.spec index fd29dad..3528710 100644 --- a/python3.10.spec +++ b/python3.10.spec @@ -17,7 +17,7 @@ URL: https://www.python.org/ %global prerel b4 %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 1%{?dist} +Release: 2%{?dist} License: Python @@ -504,6 +504,10 @@ configuration, browsers, and other dialogs. Summary: A GUI toolkit for Python Requires: %{pkgname} = %{version}-%{release} +# The importable module "turtle" is here, so provide python3-turtle. +# (We don't provide python3-turtledemo, that's not too useful when imported.) +%py_provides %{pkgname}-turtle + %description -n %{pkgname}-tkinter The Tkinter (Tk interface) library is a graphical user interface toolkit for the Python programming language. @@ -1578,6 +1582,9 @@ CheckPython optimized # ====================================================== %changelog +* Fri Jul 16 2021 Petr Viktorin - 3.10.0~b4-2 +- Provide python3-turtle from python3-tkinter + * Sun Jul 11 2021 Miro Hrončok - 3.10.0~b4-1 - Update to 3.10.0b4 From 48a8eccbb01d4fe13bba55b5655b4400e86f2eba Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Fri, 16 Jul 2021 09:49:45 +0000 Subject: [PATCH 3/8] Require pyproject-rpm-macros from python3-devel Part of the new Python packaging guidelines change: - https://fedoraproject.org/wiki/Changes/PythonPackagingGuidelines202x - https://bugzilla.redhat.com/show_bug.cgi?id=1977883 --- python3.10.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python3.10.spec b/python3.10.spec index 3528710..c43b002 100644 --- a/python3.10.spec +++ b/python3.10.spec @@ -453,6 +453,7 @@ Requires: %{pkgname}-libs%{?_isa} = %{version}-%{release} # But we want them when packages BuildRequire python3-devel Requires: (python-rpm-macros if rpm-build) Requires: (python3-rpm-macros if rpm-build) +Requires: (pyproject-rpm-macros if rpm-build) # Python developers are very likely to need pip Recommends: %{pkgname}-pip @@ -1584,6 +1585,7 @@ CheckPython optimized %changelog * Fri Jul 16 2021 Petr Viktorin - 3.10.0~b4-2 - Provide python3-turtle from python3-tkinter +- Require pyproject-rpm-macros from python3-devel * Sun Jul 11 2021 Miro Hrončok - 3.10.0~b4-1 - Update to 3.10.0b4 From c88b86e951a21275aea301a764a809e77d2efe9f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 10:31:38 +0000 Subject: [PATCH 4/8] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python3.10.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python3.10.spec b/python3.10.spec index c43b002..ceabda5 100644 --- a/python3.10.spec +++ b/python3.10.spec @@ -17,7 +17,7 @@ URL: https://www.python.org/ %global prerel b4 %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 3%{?dist} License: Python @@ -1583,6 +1583,9 @@ CheckPython optimized # ====================================================== %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 3.10.0~b4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jul 16 2021 Petr Viktorin - 3.10.0~b4-2 - Provide python3-turtle from python3-tkinter - Require pyproject-rpm-macros from python3-devel From e8bd81e89f5522a9d2c0f97f40fb4467e0538849 Mon Sep 17 00:00:00 2001 From: Tomas Hrnciar Date: Tue, 3 Aug 2021 17:05:29 +0000 Subject: [PATCH 5/8] Update to 3.10.0rc1 --- python3.10.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/python3.10.spec b/python3.10.spec index ceabda5..3fc06de 100644 --- a/python3.10.spec +++ b/python3.10.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 b4 +%global prerel rc1 %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 3%{?dist} +Release: 1%{?dist} License: Python @@ -1583,6 +1583,9 @@ CheckPython optimized # ====================================================== %changelog +* Tue Aug 03 2021 Tomas Hrnciar - 3.10.0~rc1-1 +- Update to 3.10.0rc1 + * Fri Jul 23 2021 Fedora Release Engineering - 3.10.0~b4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 9fc0481..bfe876d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (Python-3.10.0b4.tar.xz) = deb5ce510c381ce7fcdc7056754b3afccdbc4610cb77b85115859a5e636065584f517e0931a31f77723c09229b2fd751011b1cf16967c075f629018f0a7975a4 -SHA512 (Python-3.10.0b4.tar.xz.asc) = 55ef4265d9217f35e5f1da3b8b560f711c3f118230ff5fb7fe3ab5e189c22c331cecb9783465234ac0df8a1e075887b5fedfbc181cab6e571e5e2f8403d9720d +SHA512 (Python-3.10.0rc1.tar.xz) = 917c26dade7ee366ae5a39e55b6a66eaef52271be77abba9b4145557e1d97eeb753e2dbe7cc52b8aba9c038fc041055faa66525875111bd449636045a0345932 +SHA512 (Python-3.10.0rc1.tar.xz.asc) = 3b82e3549878b0399e0560683c70e08b43750c788add11286144cf283f1485d450c8be872d05d9b86a438c58184b7a81d0fb70e0353705e42aa08213938ef936 From bff61f418f4fb62c2f4b76042d6a4c6b07aaca66 Mon Sep 17 00:00:00 2001 From: Tomas Hrnciar Date: Wed, 8 Sep 2021 11:21:16 +0200 Subject: [PATCH 6/8] Update to 3.10.0rc2 --- ...est_sysconfig-for-posix_user-platlib.patch | 58 +++++++++++++++++++ python3.10.spec | 16 ++++- sources | 4 +- 3 files changed, 73 insertions(+), 5 deletions(-) create mode 100644 00367-bpo-44860-update-test_sysconfig-for-posix_user-platlib.patch diff --git a/00367-bpo-44860-update-test_sysconfig-for-posix_user-platlib.patch b/00367-bpo-44860-update-test_sysconfig-for-posix_user-platlib.patch new file mode 100644 index 0000000..bacdd9e --- /dev/null +++ b/00367-bpo-44860-update-test_sysconfig-for-posix_user-platlib.patch @@ -0,0 +1,58 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Victor Stinner +Date: Thu, 9 Sep 2021 11:02:48 +0200 +Subject: [PATCH] 00367: bpo-44860: Update test_sysconfig for posix_user + platlib + +Update test_sysconfig.test_user_similar() for the posix_user scheme: +"platlib" doesn't use sys.platlibdir. +--- + Lib/test/pythoninfo.py | 1 + + Lib/test/test_sysconfig.py | 12 +++++++++++- + .../Tests/2021-09-08-13-01-37.bpo-44860.qXd0kx.rst | 2 ++ + 3 files changed, 14 insertions(+), 1 deletion(-) + create mode 100644 Misc/NEWS.d/next/Tests/2021-09-08-13-01-37.bpo-44860.qXd0kx.rst + +diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py +index 278dfe7f7d..39ee9e1d76 100644 +--- a/Lib/test/pythoninfo.py ++++ b/Lib/test/pythoninfo.py +@@ -96,6 +96,7 @@ def collect_sys(info_add): + 'maxunicode', + 'path', + 'platform', ++ 'platlibdir', + 'prefix', + 'thread_info', + 'version', +diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py +index b8b9add36d..9408657c91 100644 +--- a/Lib/test/test_sysconfig.py ++++ b/Lib/test/test_sysconfig.py +@@ -296,7 +296,17 @@ def test_user_similar(self): + base = base.replace(sys.base_prefix, sys.prefix) + if HAS_USER_BASE: + user_path = get_path(name, 'posix_user') +- self.assertEqual(user_path, global_path.replace(base, user, 1)) ++ expected = global_path.replace(base, user, 1) ++ # bpo-44860: platlib of posix_user doesn't use sys.platlibdir, ++ # whereas posix_prefix does. ++ if name == 'platlib': ++ # Replace "/lib64/python3.11/site-packages" suffix ++ # with "/lib/python3.11/site-packages". ++ py_version_short = sysconfig.get_python_version() ++ suffix = f'python{py_version_short}/site-packages' ++ expected = expected.replace(f'/{sys.platlibdir}/{suffix}', ++ f'/lib/{suffix}') ++ self.assertEqual(user_path, expected) + + def test_main(self): + # just making sure _main() runs and returns things in the stdout +diff --git a/Misc/NEWS.d/next/Tests/2021-09-08-13-01-37.bpo-44860.qXd0kx.rst b/Misc/NEWS.d/next/Tests/2021-09-08-13-01-37.bpo-44860.qXd0kx.rst +new file mode 100644 +index 0000000000..153a9c5573 +--- /dev/null ++++ b/Misc/NEWS.d/next/Tests/2021-09-08-13-01-37.bpo-44860.qXd0kx.rst +@@ -0,0 +1,2 @@ ++Update ``test_sysconfig.test_user_similar()`` for the posix_user scheme: ++``platlib`` doesn't use :data:`sys.platlibdir`. Patch by Victor Stinner. diff --git a/python3.10.spec b/python3.10.spec index 3fc06de..4832d70 100644 --- a/python3.10.spec +++ b/python3.10.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 rc1 +%global prerel rc2 %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} Release: 1%{?dist} @@ -68,8 +68,8 @@ License: Python # If the rpmwheels condition is disabled, we use the bundled wheel packages # from Python with the versions below. # This needs to be manually updated when we update Python. -%global pip_version 21.1.3 -%global setuptools_version 56.0.0 +%global pip_version 21.2.3 +%global setuptools_version 57.4.0 # Expensive optimizations (mainly, profile-guided optimizations) %bcond_without optimizations @@ -292,6 +292,13 @@ Patch251: 00251-change-user-install-location.patch # Ideally, we should talk to upstream and explain why we don't want this Patch328: 00328-pyc-timestamp-invalidation-mode.patch +# 00367 # 35c53d99835a904129d2b0a86ad74aaf0ea78982 +# bpo-44860: Update test_sysconfig for posix_user platlib +# +# Update test_sysconfig.test_user_similar() for the posix_user scheme: +# "platlib" doesn't use sys.platlibdir. +Patch367: 00367-bpo-44860-update-test_sysconfig-for-posix_user-platlib.patch + # (New patches go here ^^^) # # When adding new patches to "python" and "python3" in Fedora, EL, etc., @@ -1583,6 +1590,9 @@ CheckPython optimized # ====================================================== %changelog +* Wed Sep 08 2021 Tomas Hrnciar - 3.10.0~rc2-1 +- Update to 3.10.0rc2 + * Tue Aug 03 2021 Tomas Hrnciar - 3.10.0~rc1-1 - Update to 3.10.0rc1 diff --git a/sources b/sources index bfe876d..4f34baf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (Python-3.10.0rc1.tar.xz) = 917c26dade7ee366ae5a39e55b6a66eaef52271be77abba9b4145557e1d97eeb753e2dbe7cc52b8aba9c038fc041055faa66525875111bd449636045a0345932 -SHA512 (Python-3.10.0rc1.tar.xz.asc) = 3b82e3549878b0399e0560683c70e08b43750c788add11286144cf283f1485d450c8be872d05d9b86a438c58184b7a81d0fb70e0353705e42aa08213938ef936 +SHA512 (Python-3.10.0rc2.tar.xz) = 8511d837e465818a7b41df4593f29179e4d420171a287deb484ab6834fe17fe6b9d49ea6ee619573c8fa02aae0bf11807b5fa5903b200e311a0ba27981ecdc04 +SHA512 (Python-3.10.0rc2.tar.xz.asc) = ce38167956314b27641f08fd5cad67bcf286154ff3a74a8987e9cda8b5737ed2218f0190726c7555cc5f49d76dee3d90521512e4560bfb4e91789217e36ee096 From 164685ac33dee0531fc5c4d8963be1a98fa1fb66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 4 Oct 2021 21:25:03 +0200 Subject: [PATCH 7/8] Update to 3.10.0 final Patch 367 was included in this release. --- ...est_sysconfig-for-posix_user-platlib.patch | 58 ------------------- python3.10.spec | 12 ++-- sources | 4 +- 3 files changed, 6 insertions(+), 68 deletions(-) delete mode 100644 00367-bpo-44860-update-test_sysconfig-for-posix_user-platlib.patch diff --git a/00367-bpo-44860-update-test_sysconfig-for-posix_user-platlib.patch b/00367-bpo-44860-update-test_sysconfig-for-posix_user-platlib.patch deleted file mode 100644 index bacdd9e..0000000 --- a/00367-bpo-44860-update-test_sysconfig-for-posix_user-platlib.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Victor Stinner -Date: Thu, 9 Sep 2021 11:02:48 +0200 -Subject: [PATCH] 00367: bpo-44860: Update test_sysconfig for posix_user - platlib - -Update test_sysconfig.test_user_similar() for the posix_user scheme: -"platlib" doesn't use sys.platlibdir. ---- - Lib/test/pythoninfo.py | 1 + - Lib/test/test_sysconfig.py | 12 +++++++++++- - .../Tests/2021-09-08-13-01-37.bpo-44860.qXd0kx.rst | 2 ++ - 3 files changed, 14 insertions(+), 1 deletion(-) - create mode 100644 Misc/NEWS.d/next/Tests/2021-09-08-13-01-37.bpo-44860.qXd0kx.rst - -diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py -index 278dfe7f7d..39ee9e1d76 100644 ---- a/Lib/test/pythoninfo.py -+++ b/Lib/test/pythoninfo.py -@@ -96,6 +96,7 @@ def collect_sys(info_add): - 'maxunicode', - 'path', - 'platform', -+ 'platlibdir', - 'prefix', - 'thread_info', - 'version', -diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py -index b8b9add36d..9408657c91 100644 ---- a/Lib/test/test_sysconfig.py -+++ b/Lib/test/test_sysconfig.py -@@ -296,7 +296,17 @@ def test_user_similar(self): - base = base.replace(sys.base_prefix, sys.prefix) - if HAS_USER_BASE: - user_path = get_path(name, 'posix_user') -- self.assertEqual(user_path, global_path.replace(base, user, 1)) -+ expected = global_path.replace(base, user, 1) -+ # bpo-44860: platlib of posix_user doesn't use sys.platlibdir, -+ # whereas posix_prefix does. -+ if name == 'platlib': -+ # Replace "/lib64/python3.11/site-packages" suffix -+ # with "/lib/python3.11/site-packages". -+ py_version_short = sysconfig.get_python_version() -+ suffix = f'python{py_version_short}/site-packages' -+ expected = expected.replace(f'/{sys.platlibdir}/{suffix}', -+ f'/lib/{suffix}') -+ self.assertEqual(user_path, expected) - - def test_main(self): - # just making sure _main() runs and returns things in the stdout -diff --git a/Misc/NEWS.d/next/Tests/2021-09-08-13-01-37.bpo-44860.qXd0kx.rst b/Misc/NEWS.d/next/Tests/2021-09-08-13-01-37.bpo-44860.qXd0kx.rst -new file mode 100644 -index 0000000000..153a9c5573 ---- /dev/null -+++ b/Misc/NEWS.d/next/Tests/2021-09-08-13-01-37.bpo-44860.qXd0kx.rst -@@ -0,0 +1,2 @@ -+Update ``test_sysconfig.test_user_similar()`` for the posix_user scheme: -+``platlib`` doesn't use :data:`sys.platlibdir`. Patch by Victor Stinner. diff --git a/python3.10.spec b/python3.10.spec index 4832d70..29381ac 100644 --- a/python3.10.spec +++ b/python3.10.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 rc2 +#global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} Release: 1%{?dist} @@ -292,13 +292,6 @@ Patch251: 00251-change-user-install-location.patch # Ideally, we should talk to upstream and explain why we don't want this Patch328: 00328-pyc-timestamp-invalidation-mode.patch -# 00367 # 35c53d99835a904129d2b0a86ad74aaf0ea78982 -# bpo-44860: Update test_sysconfig for posix_user platlib -# -# Update test_sysconfig.test_user_similar() for the posix_user scheme: -# "platlib" doesn't use sys.platlibdir. -Patch367: 00367-bpo-44860-update-test_sysconfig-for-posix_user-platlib.patch - # (New patches go here ^^^) # # When adding new patches to "python" and "python3" in Fedora, EL, etc., @@ -1590,6 +1583,9 @@ CheckPython optimized # ====================================================== %changelog +* Mon Oct 04 2021 Miro Hrončok - 3.10.0-1 +- Update to 3.10.0 final + * Wed Sep 08 2021 Tomas Hrnciar - 3.10.0~rc2-1 - Update to 3.10.0rc2 diff --git a/sources b/sources index 4f34baf..29a970b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (Python-3.10.0rc2.tar.xz) = 8511d837e465818a7b41df4593f29179e4d420171a287deb484ab6834fe17fe6b9d49ea6ee619573c8fa02aae0bf11807b5fa5903b200e311a0ba27981ecdc04 -SHA512 (Python-3.10.0rc2.tar.xz.asc) = ce38167956314b27641f08fd5cad67bcf286154ff3a74a8987e9cda8b5737ed2218f0190726c7555cc5f49d76dee3d90521512e4560bfb4e91789217e36ee096 +SHA512 (Python-3.10.0.tar.xz) = 82b2729afc7d72a80882f199970667dce7d971a2e5ecfe6cf84f7b68612ab2caf6ed6d7a8cb81f24ea85cb0816464bb2e8b2e6884eda62fa40742edc674193bd +SHA512 (Python-3.10.0.tar.xz.asc) = 67236e02bc49da1423717cb54216b745f613ba2fc4b372a4aa15a36ab15fe69d9b9087070382957d480df7576d13056caedcd979fb56531799a1190b822f673d From 8c319ef159f8bbf1362e7d071cfe13ed6511302c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= Date: Thu, 7 Oct 2021 07:30:41 +0200 Subject: [PATCH 8/8] Enable test_frozentable test_frozentable was disabled due to error in Python 3.10.0a6. This is now fixed so test can be enabled again. --- python3.10.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/python3.10.spec b/python3.10.spec index 29381ac..8374837 100644 --- a/python3.10.spec +++ b/python3.10.spec @@ -1058,10 +1058,8 @@ CheckPython() { # test_distutils # distutils.tests.test_bdist_rpm tests fail when bootstraping the Python # package: rpmbuild requires /usr/bin/pythonX.Y to be installed - # test_frozentable fails with Python 3.10.0a6 (https://bugs.python.org/issue43372) LD_LIBRARY_PATH=$ConfDir $ConfDir/python -m test.regrtest \ -wW --slowest -j0 --timeout=1800 \ - -i test_frozentable \ %if %{with bootstrap} -x test_distutils \ %endif