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 c9a6ddb..8f3be9b 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 rc2 +#global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 1%{?dist} License: Python @@ -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 + * Tue Sep 14 2021 Sahana Prasad - 3.10.0~rc2-2 - Rebuilt with OpenSSL 3.0.0 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