From 2a690830632ac68ae155f4ff997eade67f5a82937bc3f2aed64b9ff2cd0f84ce Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 5 Dec 2024 21:49:05 +0000 Subject: [PATCH] Update patches OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python312?expand=0&rev=87 --- F00251-change-user-install-location.patch | 38 +++++++++++++---------- fix_configure_rst.patch | 2 +- python-3.3.0b1-test-posix_fadvise.patch | 2 +- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/F00251-change-user-install-location.patch b/F00251-change-user-install-location.patch index bdab695..f6e4f6d 100644 --- a/F00251-change-user-install-location.patch +++ b/F00251-change-user-install-location.patch @@ -24,15 +24,12 @@ Co-authored-by: Miro Hrončok Co-authored-by: Michal Cyprian Co-authored-by: Lumír Balhar --- - Lib/site.py | 9 ++++++- - Lib/sysconfig.py | 49 +++++++++++++++++++++++++++++++++++++- - Lib/test/test_sysconfig.py | 17 +++++++++++-- - 3 files changed, 71 insertions(+), 4 deletions(-) + Lib/sysconfig.py | 51 ++++++++++++++++++++++++++++++++++++++++++++- + Lib/test/test_sysconfig.py | 17 +++++++++++++-- + 2 files changed, 65 insertions(+), 3 deletions(-) -Index: Python-3.12.4/Lib/sysconfig.py -=================================================================== ---- Python-3.12.4.orig/Lib/sysconfig.py -+++ Python-3.12.4/Lib/sysconfig.py +--- a/Lib/sysconfig.py ++++ b/Lib/sysconfig.py @@ -104,6 +104,11 @@ if os.name == 'nt': else: _INSTALL_SCHEMES['venv'] = _INSTALL_SCHEMES['posix_venv'] @@ -45,7 +42,7 @@ Index: Python-3.12.4/Lib/sysconfig.py # NOTE: site.py has copy of this function. # Sync it when modify this function. -@@ -163,6 +168,19 @@ if _HAS_USER_BASE: +@@ -163,13 +168,28 @@ if _HAS_USER_BASE: }, } @@ -65,7 +62,16 @@ Index: Python-3.12.4/Lib/sysconfig.py _SCHEME_KEYS = ('stdlib', 'platstdlib', 'purelib', 'platlib', 'include', 'scripts', 'data') -@@ -263,11 +281,40 @@ def _extend_dict(target_dict, other_dict + _PY_VERSION = sys.version.split()[0] + _PY_VERSION_SHORT = f'{sys.version_info[0]}.{sys.version_info[1]}' + _PY_VERSION_SHORT_NO_DOT = f'{sys.version_info[0]}{sys.version_info[1]}' ++_PREFIX = os.path.normpath(sys.prefix) + _BASE_PREFIX = os.path.normpath(sys.base_prefix) ++_EXEC_PREFIX = os.path.normpath(sys.exec_prefix) + _BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix) + # Mutex guarding initialization of _CONFIG_VARS. + _CONFIG_VARS_LOCK = threading.RLock() +@@ -261,11 +281,40 @@ def _extend_dict(target_dict, other_dict target_dict[key] = value @@ -107,11 +113,9 @@ Index: Python-3.12.4/Lib/sysconfig.py if os.name == 'nt': # On Windows we want to substitute 'lib' for schemes rather # than the native value (without modifying vars, in case it -Index: Python-3.12.4/Lib/test/test_sysconfig.py -=================================================================== ---- Python-3.12.4.orig/Lib/test/test_sysconfig.py -+++ Python-3.12.4/Lib/test/test_sysconfig.py -@@ -110,8 +110,19 @@ class TestSysConfig(unittest.TestCase): +--- a/Lib/test/test_sysconfig.py ++++ b/Lib/test/test_sysconfig.py +@@ -119,8 +119,19 @@ class TestSysConfig(unittest.TestCase): for scheme in _INSTALL_SCHEMES: for name in _INSTALL_SCHEMES[scheme]: expected = _INSTALL_SCHEMES[scheme][name].format(**config_vars) @@ -132,7 +136,7 @@ Index: Python-3.12.4/Lib/test/test_sysconfig.py os.path.normpath(expected), ) -@@ -344,7 +355,7 @@ class TestSysConfig(unittest.TestCase): +@@ -353,7 +364,7 @@ class TestSysConfig(unittest.TestCase): self.assertTrue(os.path.isfile(config_h), config_h) def test_get_scheme_names(self): @@ -141,7 +145,7 @@ Index: Python-3.12.4/Lib/test/test_sysconfig.py if HAS_USER_BASE: wanted.extend(['nt_user', 'osx_framework_user', 'posix_user']) self.assertEqual(get_scheme_names(), tuple(sorted(wanted))) -@@ -356,6 +367,8 @@ class TestSysConfig(unittest.TestCase): +@@ -365,6 +376,8 @@ class TestSysConfig(unittest.TestCase): cmd = "-c", "import sysconfig; print(sysconfig.get_platform())" self.assertEqual(py.call_real(*cmd), py.call_link(*cmd)) diff --git a/fix_configure_rst.patch b/fix_configure_rst.patch index 5620ac0..2ee5323 100644 --- a/fix_configure_rst.patch +++ b/fix_configure_rst.patch @@ -21,7 +21,7 @@ Create a Python.framework rather than a traditional Unix install. Optional --- a/Misc/NEWS +++ b/Misc/NEWS -@@ -14138,7 +14138,7 @@ C API +@@ -14575,7 +14575,7 @@ C API - bpo-40939: Removed documentation for the removed ``PyParser_*`` C API. - bpo-43795: The list in :ref:`limited-api-list` now shows the public name diff --git a/python-3.3.0b1-test-posix_fadvise.patch b/python-3.3.0b1-test-posix_fadvise.patch index 81c0deb..0a6b091 100644 --- a/python-3.3.0b1-test-posix_fadvise.patch +++ b/python-3.3.0b1-test-posix_fadvise.patch @@ -4,7 +4,7 @@ --- a/Lib/test/test_posix.py +++ b/Lib/test/test_posix.py -@@ -435,7 +435,7 @@ class PosixTester(unittest.TestCase): +@@ -437,7 +437,7 @@ class PosixTester(unittest.TestCase): def test_posix_fadvise(self): fd = os.open(os_helper.TESTFN, os.O_RDONLY) try: