Update to 3.10.0rc2
This commit is contained in:
Tomas Hrnciar
parent
bda63fb917
commit
19e0804a72
|
|
@ -0,0 +1,58 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Victor Stinner <vstinner@python.org>
|
||||
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.
|
||||
|
|
@ -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 <thrnciar@redhat.com> - 3.10.0~rc2-1
|
||||
- Update to 3.10.0rc2
|
||||
|
||||
* Tue Aug 03 2021 Tomas Hrnciar <thrnciar@redhat.com> - 3.10.0~rc1-1
|
||||
- Update to 3.10.0rc1
|
||||
|
||||
|
|
|
|||
4
sources
4
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
|
||||
|
|
|
|||
Loading…
Reference in New Issue