mirror of
https://git.yoctoproject.org/poky
synced 2026-02-07 09:16:36 +01:00
python3: upgrade 3.12.6 -> 3.12.7
Changelog: https://docs.python.org/release/3.12.7/whatsnew/changelog.html#python-3-12-7 (From OE-Core rev: 103cb3a5390214bd95a75c4db4b00f64b456b7f1) Signed-off-by: Guðni Már Gilbert <gudni.m.g@gmail.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
committed by
Steve Sakoman
parent
d65fa3f3a7
commit
1b4d8585f0
@@ -1,4 +1,4 @@
|
||||
From 365399f17d35719d828ddd49182dcb401fb7791c Mon Sep 17 00:00:00 2001
|
||||
From 733b46f11d311290e37fcb30f08c47660b888d22 Mon Sep 17 00:00:00 2001
|
||||
From: Paulo Neves <ptsneves@gmail.com>
|
||||
Date: Tue, 7 Jun 2022 16:16:41 +0200
|
||||
Subject: [PATCH] Avoid shebang overflow on python-config.py
|
||||
@@ -16,10 +16,10 @@ Upstream-Status: Denied [distribution]
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
||||
index 77bf09a..6353c57 100644
|
||||
index b1c5413..e88f301 100644
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -2339,6 +2339,8 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
|
||||
@@ -2349,6 +2349,8 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
|
||||
@ # Substitution happens here, as the completely-expanded BINDIR
|
||||
@ # is not available in configure
|
||||
sed -e "s,@EXENAME@,$(EXENAME)," < $(srcdir)/Misc/python-config.in >python-config.py
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From f8a664cf1fc73e381d57d6927207286059744837 Mon Sep 17 00:00:00 2001
|
||||
From c6ba19a4cfdb0a5b137b91ef761f654b70776a47 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex@linutronix.de>
|
||||
Date: Thu, 16 Sep 2021 16:35:37 +0200
|
||||
Subject: [PATCH] Lib/pty.py: handle stdin I/O errors same way as master I/O
|
||||
@@ -24,7 +24,6 @@ So let's treat both channels the same.
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/python/cpython/pull/28388]
|
||||
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||
|
||||
---
|
||||
Lib/pty.py | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 71c194077bb907bfe423d3f3275f33a6c8ca0e74 Mon Sep 17 00:00:00 2001
|
||||
From d325a4e1fde5bd817c88f37d5e7b6e93a3bad077 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex@linutronix.de>
|
||||
Date: Fri, 17 Nov 2023 14:26:32 +0100
|
||||
Subject: [PATCH] Lib/sysconfig.py: use prefix value from build configuration
|
||||
@@ -9,7 +9,6 @@ native python.
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core cross builds]
|
||||
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||
|
||||
---
|
||||
Lib/sysconfig.py | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 38278339832a57dbf5fa3ef21accaa03e2c814d7 Mon Sep 17 00:00:00 2001
|
||||
From a727a950023b9384955c912f4975d36a8d7913b4 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Wed, 30 Jan 2019 12:41:04 +0100
|
||||
Subject: [PATCH] Makefile.pre: use qemu wrapper when gathering profile data
|
||||
@@ -10,10 +10,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
||||
index dd5e69f..381feb0 100644
|
||||
index 0e64ccc..23e20e9 100644
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -658,8 +658,7 @@ profile-run-stamp:
|
||||
@@ -660,8 +660,7 @@ profile-run-stamp:
|
||||
# enabled.
|
||||
$(MAKE) profile-gen-stamp
|
||||
# Next, run the profile task to generate the profile information.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 3471e3478e0760c42e04f8046cee2367ab5706d2 Mon Sep 17 00:00:00 2001
|
||||
From 6b0088a3d222b7fe5304f6bc0d6b15d3c41e68f3 Mon Sep 17 00:00:00 2001
|
||||
From: Yi Fan Yu <yifan.yu@windriver.com>
|
||||
Date: Thu, 1 Apr 2021 13:08:37 -0700
|
||||
Subject: [PATCH] Skip failing tests due to load variability on YP AB
|
||||
@@ -23,7 +23,7 @@ Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
|
||||
2 files changed, 5 insertions(+)
|
||||
|
||||
diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
|
||||
index e42c7ab..dff5227 100644
|
||||
index aac74ea..3470bc5 100644
|
||||
--- a/Lib/test/_test_multiprocessing.py
|
||||
+++ b/Lib/test/_test_multiprocessing.py
|
||||
@@ -682,6 +682,7 @@ class _TestProcess(BaseTestCase):
|
||||
@@ -34,7 +34,7 @@ index e42c7ab..dff5227 100644
|
||||
def test_many_processes(self):
|
||||
if self.TYPE == 'threads':
|
||||
self.skipTest('test not appropriate for {}'.format(self.TYPE))
|
||||
@@ -2066,6 +2067,7 @@ class _TestBarrier(BaseTestCase):
|
||||
@@ -2083,6 +2084,7 @@ class _TestBarrier(BaseTestCase):
|
||||
except threading.BrokenBarrierError:
|
||||
results.append(True)
|
||||
|
||||
@@ -42,7 +42,7 @@ index e42c7ab..dff5227 100644
|
||||
def test_timeout(self):
|
||||
"""
|
||||
Test wait(timeout)
|
||||
@@ -5024,6 +5026,7 @@ class TestWait(unittest.TestCase):
|
||||
@@ -5080,6 +5082,7 @@ class TestWait(unittest.TestCase):
|
||||
time.sleep(period)
|
||||
|
||||
@support.requires_resource('walltime')
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 37d058e841ba3bd89b5746cc5381afb014b11581 Mon Sep 17 00:00:00 2001
|
||||
From f0b18f1b3b3d5b40d65e08a184f4e3463745b891 Mon Sep 17 00:00:00 2001
|
||||
From: Wentao Zhang <wentao.zhang@windriver.com>
|
||||
Date: Mon, 20 Mar 2023 13:39:52 +0800
|
||||
Subject: [PATCH] Update test_sysconfig for posix_user purelib
|
||||
@@ -17,16 +17,15 @@ Update test_sysconfig.test_user_similar() for the posix_user scheme:
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Wentao Zhang <wentao.zhang@windriver.com>
|
||||
|
||||
---
|
||||
Lib/test/test_sysconfig.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
|
||||
index b6dbf3d..5672590 100644
|
||||
index 1137c20..f5c8980 100644
|
||||
--- a/Lib/test/test_sysconfig.py
|
||||
+++ b/Lib/test/test_sysconfig.py
|
||||
@@ -372,7 +372,7 @@ class TestSysConfig(unittest.TestCase):
|
||||
@@ -381,7 +381,7 @@ class TestSysConfig(unittest.TestCase):
|
||||
expected = os.path.normpath(global_path.replace(base, user, 1))
|
||||
# bpo-44860: platlib of posix_user doesn't use sys.platlibdir,
|
||||
# whereas posix_prefix does.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 999d4e74d34afa233ad8ad0c70b989d77a21957f Mon Sep 17 00:00:00 2001
|
||||
From 73960393a559d0de5edf07b022d182cac54df9dc Mon Sep 17 00:00:00 2001
|
||||
From: Petr Viktorin <encukou@gmail.com>
|
||||
Date: Wed, 23 Aug 2023 20:00:07 +0200
|
||||
Subject: [PATCH] gh-107811: tarfile: treat overflow in UID/GID as failure to
|
||||
@@ -13,10 +13,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
create mode 100644 Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst
|
||||
|
||||
diff --git a/Lib/tarfile.py b/Lib/tarfile.py
|
||||
index 3bbbcaa..473167d 100755
|
||||
index 0a0f31e..4dfb67d 100755
|
||||
--- a/Lib/tarfile.py
|
||||
+++ b/Lib/tarfile.py
|
||||
@@ -2557,7 +2557,8 @@ class TarFile(object):
|
||||
@@ -2590,7 +2590,8 @@ class TarFile(object):
|
||||
os.lchown(targetpath, u, g)
|
||||
else:
|
||||
os.chown(targetpath, u, g)
|
||||
@@ -35,6 +35,3 @@ index 0000000..ffca413
|
||||
+:mod:`tarfile`: extraction of members with overly large UID or GID (e.g. on
|
||||
+an OS with 32-bit :c:type:`!id_t`) now fails in the same way as failing to
|
||||
+set the ID.
|
||||
--
|
||||
2.45.0
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From ababc7b1db8c406910766e11cdd04cbef7a706c9 Mon Sep 17 00:00:00 2001
|
||||
From f834492007487e9e87b3d3f1f3c5cc440e6ec5e2 Mon Sep 17 00:00:00 2001
|
||||
From: Changqing Li <changqing.li@windriver.com>
|
||||
Date: Mon, 22 Oct 2018 15:19:51 +0800
|
||||
Subject: [PATCH] python3: use cc_basename to replace CC for checking compiler
|
||||
@@ -26,7 +26,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
||||
1 file changed, 10 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 384718d..5a1d58b 100644
|
||||
index d0d5405..093f8b5 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -137,6 +137,7 @@ AC_CONFIG_HEADERS([pyconfig.h])
|
||||
@@ -73,7 +73,7 @@ index 384718d..5a1d58b 100644
|
||||
*clang*)
|
||||
# Any changes made here should be reflected in the GCC+Darwin case below
|
||||
PGO_PROF_GEN_FLAG="-fprofile-instr-generate"
|
||||
@@ -2147,7 +2148,7 @@ AC_MSG_RESULT([$BOLT_APPLY_FLAGS])
|
||||
@@ -2155,7 +2156,7 @@ AC_MSG_RESULT([$BOLT_APPLY_FLAGS])
|
||||
# compiler and platform. BASECFLAGS tweaks need to be made even if the
|
||||
# user set OPT.
|
||||
|
||||
@@ -82,7 +82,7 @@ index 384718d..5a1d58b 100644
|
||||
*clang*)
|
||||
cc_is_clang=1
|
||||
;;
|
||||
@@ -2419,7 +2420,7 @@ yes)
|
||||
@@ -2427,7 +2428,7 @@ yes)
|
||||
|
||||
# ICC doesn't recognize the option, but only emits a warning
|
||||
## XXX does it emit an unused result warning and can it be disabled?
|
||||
@@ -91,7 +91,7 @@ index 384718d..5a1d58b 100644
|
||||
[*icc*], [ac_cv_disable_unused_result_warning=no]
|
||||
[PY_CHECK_CC_WARNING([disable], [unused-result])])
|
||||
AS_VAR_IF([ac_cv_disable_unused_result_warning], [yes],
|
||||
@@ -2665,7 +2666,7 @@ yes)
|
||||
@@ -2673,7 +2674,7 @@ yes)
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -100,7 +100,7 @@ index 384718d..5a1d58b 100644
|
||||
*mpicc*)
|
||||
CFLAGS_NODIST="$CFLAGS_NODIST"
|
||||
;;
|
||||
@@ -3482,7 +3483,7 @@ then
|
||||
@@ -3508,7 +3509,7 @@ then
|
||||
then
|
||||
LINKFORSHARED="-Wl,--export-dynamic"
|
||||
fi;;
|
||||
@@ -109,7 +109,7 @@ index 384718d..5a1d58b 100644
|
||||
*gcc*)
|
||||
if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
|
||||
then
|
||||
@@ -6803,7 +6804,7 @@ if test "$ac_cv_gcc_asm_for_x87" = yes; then
|
||||
@@ -6831,7 +6832,7 @@ if test "$ac_cv_gcc_asm_for_x87" = yes; then
|
||||
# Some versions of gcc miscompile inline asm:
|
||||
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491
|
||||
# http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 217cea231462e7703e8c9ea39c0a6833f799a420 Mon Sep 17 00:00:00 2001
|
||||
From 642205e1f728873b16debc24c2938339d31be6a9 Mon Sep 17 00:00:00 2001
|
||||
From: Trevor Gamblin <tgamblin@baylibre.com>
|
||||
Date: Fri, 15 Sep 2023 08:48:33 -0400
|
||||
Subject: [PATCH] skip no_stdout_fileno test due to load variability
|
||||
@@ -16,10 +16,10 @@ Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
|
||||
index 4d03c46..b329b7a 100644
|
||||
index c71c568..e41ab5e 100644
|
||||
--- a/Lib/test/test_builtin.py
|
||||
+++ b/Lib/test/test_builtin.py
|
||||
@@ -2326,6 +2326,7 @@ class PtyTests(unittest.TestCase):
|
||||
@@ -2352,6 +2352,7 @@ class PtyTests(unittest.TestCase):
|
||||
# Check stdin/stdout error handler is used when invoking PyOS_Readline()
|
||||
self.check_input_tty("prompté", b"quux\xe9", "ascii")
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From a5d429a0e1a4809c1ded7be7e45dcabeb82c53d8 Mon Sep 17 00:00:00 2001
|
||||
From fac0f14fd34386e47bab71c0043ea55b507ae39c Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex@linutronix.de>
|
||||
Date: Sun, 12 Sep 2021 21:44:36 +0200
|
||||
Subject: [PATCH] sysconfig.py: use platlibdir also for purelib
|
||||
@@ -8,7 +8,6 @@ is not correct.
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||
|
||||
---
|
||||
Lib/sysconfig.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From bf3eb28bba24509a3e1cd40f1f0e26db833779a2 Mon Sep 17 00:00:00 2001
|
||||
From 7f75355e27ee7f25391523294e4c6653edf554f8 Mon Sep 17 00:00:00 2001
|
||||
From: Trevor Gamblin <tgamblin@baylibre.com>
|
||||
Date: Thu, 13 Jun 2024 10:54:31 -0400
|
||||
Subject: [PATCH] test_active_children: skip problematic test
|
||||
@@ -14,10 +14,10 @@ Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
|
||||
index 3955123455..a1861fa3a0 100644
|
||||
index 3470bc5..0e42ac1 100644
|
||||
--- a/Lib/test/_test_multiprocessing.py
|
||||
+++ b/Lib/test/_test_multiprocessing.py
|
||||
@@ -579,6 +579,7 @@ def test_cpu_count(self):
|
||||
@@ -579,6 +579,7 @@ class _TestProcess(BaseTestCase):
|
||||
self.assertTrue(type(cpus) is int)
|
||||
self.assertTrue(cpus >= 1)
|
||||
|
||||
@@ -25,6 +25,3 @@ index 3955123455..a1861fa3a0 100644
|
||||
def test_active_children(self):
|
||||
self.assertEqual(type(self.active_children()), list)
|
||||
|
||||
--
|
||||
2.45.2
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From b64c131a576a4b4f821514e711ab91b1394fb4ff Mon Sep 17 00:00:00 2001
|
||||
From 174ef9a40c9f4373fd90b00425fd94a89f96dbf9 Mon Sep 17 00:00:00 2001
|
||||
From: Tim Orling <timothy.t.orling@intel.com>
|
||||
Date: Fri, 18 Jun 2021 11:56:50 -0700
|
||||
Subject: [PATCH] test_ctypes.test_find: skip without tools-sdk
|
||||
@@ -10,13 +10,12 @@ easiest way to dynamically check for that is looking for
|
||||
Upstream-Status: Inappropriate [oe-specific]
|
||||
|
||||
Signed-off-by: Tim Orling <timothy.t.orling@intel.com>
|
||||
|
||||
---
|
||||
Lib/test/test_ctypes/test_find.py | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/Lib/test/test_ctypes/test_find.py b/Lib/test/test_ctypes/test_find.py
|
||||
index 1ff9d01..59def26 100644
|
||||
index a41e949..eb5fe19 100644
|
||||
--- a/Lib/test/test_ctypes/test_find.py
|
||||
+++ b/Lib/test/test_ctypes/test_find.py
|
||||
@@ -113,10 +113,12 @@ class FindLibraryLinux(unittest.TestCase):
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From d7e3f26e7094fbe20e2271d75f18ac3b23a67f58 Mon Sep 17 00:00:00 2001
|
||||
From 621ba76ef956708cdaf4fd5bc0e25aa59d427c5b Mon Sep 17 00:00:00 2001
|
||||
From: Trevor Gamblin <tgamblin@baylibre.com>
|
||||
Date: Wed, 12 Jun 2024 10:29:03 -0400
|
||||
Subject: [PATCH] test_deadlock: skip problematic test
|
||||
@@ -14,10 +14,10 @@ Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/Lib/test/test_concurrent_futures/test_deadlock.py b/Lib/test/test_concurrent_futures/test_deadlock.py
|
||||
index 1db4cd0099..fd07895a17 100644
|
||||
index e8cd8f6..021906b 100644
|
||||
--- a/Lib/test/test_concurrent_futures/test_deadlock.py
|
||||
+++ b/Lib/test/test_concurrent_futures/test_deadlock.py
|
||||
@@ -90,6 +90,7 @@ def __reduce__(self):
|
||||
@@ -90,6 +90,7 @@ class ErrorAtUnpickle(object):
|
||||
return _raise_error_ignore_stderr, (UnpicklingError, )
|
||||
|
||||
|
||||
@@ -25,6 +25,3 @@ index 1db4cd0099..fd07895a17 100644
|
||||
class ExecutorDeadlockTest:
|
||||
TIMEOUT = support.LONG_TIMEOUT
|
||||
|
||||
--
|
||||
2.45.2
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From ef5728f0af14da5c9f80b0f038fe5bf6d44cb0e9 Mon Sep 17 00:00:00 2001
|
||||
From d74e5f24b574fa4d571a64e647c916a7ebe26b3e Mon Sep 17 00:00:00 2001
|
||||
From: Mingli Yu <mingli.yu@windriver.com>
|
||||
Date: Mon, 5 Aug 2019 15:57:39 +0800
|
||||
Subject: [PATCH] test_locale.py: correct the test output format
|
||||
@@ -26,16 +26,15 @@ Upstream-Status: Submitted [https://github.com/python/cpython/pull/15132]
|
||||
Rebased for 3.9.4, still not accepted upstream Signed-off-by: Alejandro Hernandez <alejandro@enedino.org>
|
||||
|
||||
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
||||
|
||||
---
|
||||
Lib/test/test_locale.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py
|
||||
index b0d7998..cb12153 100644
|
||||
index cde80a4..e8ffd71 100644
|
||||
--- a/Lib/test/test_locale.py
|
||||
+++ b/Lib/test/test_locale.py
|
||||
@@ -557,7 +557,7 @@ class TestMiscellaneous(unittest.TestCase):
|
||||
@@ -561,7 +561,7 @@ class TestMiscellaneous(unittest.TestCase):
|
||||
self.skipTest('test needs Turkish locale')
|
||||
loc = locale.getlocale(locale.LC_CTYPE)
|
||||
if verbose:
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From d9d916d5ea946c945323679d1709de1b87029b96 Mon Sep 17 00:00:00 2001
|
||||
From bc5c70dc2a2fcfe51481de0ad800baa849592222 Mon Sep 17 00:00:00 2001
|
||||
From: Trevor Gamblin <tgamblin@baylibre.com>
|
||||
Date: Tue, 13 Aug 2024 11:07:05 -0400
|
||||
Subject: [PATCH] test_readline: skip limited history test
|
||||
@@ -16,11 +16,11 @@ Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
|
||||
Lib/test/test_readline.py | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
Index: Python-3.12.6/Lib/test/test_readline.py
|
||||
===================================================================
|
||||
--- Python-3.12.6.orig/Lib/test/test_readline.py
|
||||
+++ Python-3.12.6/Lib/test/test_readline.py
|
||||
@@ -133,6 +133,7 @@ class TestHistoryManipulation (unittest.
|
||||
diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py
|
||||
index fab124a..291dd48 100644
|
||||
--- a/Lib/test/test_readline.py
|
||||
+++ b/Lib/test/test_readline.py
|
||||
@@ -133,6 +133,7 @@ class TestHistoryManipulation (unittest.TestCase):
|
||||
self.assertEqual(readline.get_history_item(1), "entrée 1")
|
||||
self.assertEqual(readline.get_history_item(2), "entrée 22")
|
||||
|
||||
@@ -28,7 +28,7 @@ Index: Python-3.12.6/Lib/test/test_readline.py
|
||||
def test_write_read_limited_history(self):
|
||||
previous_length = readline.get_history_length()
|
||||
self.addCleanup(readline.set_history_length, previous_length)
|
||||
@@ -371,6 +372,7 @@ readline.write_history_file(history_file
|
||||
@@ -371,6 +372,7 @@ readline.write_history_file(history_file)
|
||||
self.assertIn(b"done", output)
|
||||
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 9d4cdbde100798ba9fa1cf3f82dbaf18fd10a543 Mon Sep 17 00:00:00 2001
|
||||
From b637ac8f58d17bc8888b2027a572c87531a4539d Mon Sep 17 00:00:00 2001
|
||||
From: Trevor Gamblin <tgamblin@baylibre.com>
|
||||
Date: Wed, 8 May 2024 11:58:09 -0400
|
||||
Subject: [PATCH] test_shutdown: skip problematic test
|
||||
@@ -14,7 +14,7 @@ Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/Lib/test/test_concurrent_futures/test_shutdown.py b/Lib/test/test_concurrent_futures/test_shutdown.py
|
||||
index 7a4065afd4..6b878a48bf 100644
|
||||
index 7a4065a..6b878a4 100644
|
||||
--- a/Lib/test/test_concurrent_futures/test_shutdown.py
|
||||
+++ b/Lib/test/test_concurrent_futures/test_shutdown.py
|
||||
@@ -20,6 +20,7 @@ def sleep_and_print(t, msg):
|
||||
@@ -25,7 +25,7 @@ index 7a4065afd4..6b878a48bf 100644
|
||||
class ExecutorShutdownTest:
|
||||
def test_run_after_shutdown(self):
|
||||
self.executor.shutdown()
|
||||
@@ -156,6 +157,7 @@ def timeout(_signum, _frame):
|
||||
@@ -156,6 +157,7 @@ class ExecutorShutdownTest:
|
||||
signal.signal(signal.SIGALRM, old_handler)
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ index 7a4065afd4..6b878a48bf 100644
|
||||
class ThreadPoolShutdownTest(ThreadPoolMixin, ExecutorShutdownTest, BaseTestCase):
|
||||
def test_threads_terminate(self):
|
||||
def acquire_lock(lock):
|
||||
@@ -252,6 +254,7 @@ def test_cancel_futures_wait_false(self):
|
||||
@@ -252,6 +254,7 @@ class ThreadPoolShutdownTest(ThreadPoolMixin, ExecutorShutdownTest, BaseTestCase
|
||||
self.assertIn(out.strip(), [b"apple", b""])
|
||||
|
||||
|
||||
@@ -41,6 +41,3 @@ index 7a4065afd4..6b878a48bf 100644
|
||||
class ProcessPoolShutdownTest(ExecutorShutdownTest):
|
||||
def test_processes_terminate(self):
|
||||
def acquire_lock(lock):
|
||||
--
|
||||
2.45.0
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From dc69a1afdb3ba619705ff71e14f19ed3142e422f Mon Sep 17 00:00:00 2001
|
||||
From 1a1e5c30021a200b2dc853690dbf1edfba9ca262 Mon Sep 17 00:00:00 2001
|
||||
From: Trevor Gamblin <tgamblin@baylibre.com>
|
||||
Date: Fri, 6 Oct 2023 10:59:44 -0400
|
||||
Subject: [PATCH] test_storlines: skip due to load variability
|
||||
@@ -11,13 +11,12 @@ Upstream-Status: Inappropriate [OE-Specific]
|
||||
[YOCTO #14933]
|
||||
|
||||
Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
|
||||
|
||||
---
|
||||
Lib/test/test_ftplib.py | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py
|
||||
index 2f191ea..dc29346 100644
|
||||
index 4c4a449..b8c79a4 100644
|
||||
--- a/Lib/test/test_ftplib.py
|
||||
+++ b/Lib/test/test_ftplib.py
|
||||
@@ -626,6 +626,7 @@ class TestFTPClass(TestCase):
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From d0205c60d08f51d84bd8ddc07a57e8c71710fdad Mon Sep 17 00:00:00 2001
|
||||
From 8543ad744a2839acf1f4eec967acd645fd89d1a7 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex@linutronix.de>
|
||||
Date: Fri, 17 Nov 2023 14:16:40 +0100
|
||||
Subject: [PATCH] configure.ac: do not add a curses include path from the host
|
||||
@@ -15,10 +15,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
1 file changed, 6 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index c49cd4f..affdedf 100644
|
||||
index cdc54e5..d163c73 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -6508,12 +6508,6 @@ AS_VAR_IF([have_panel], [no], [
|
||||
@@ -6536,12 +6536,6 @@ AS_VAR_IF([have_panel], [no], [
|
||||
AC_MSG_RESULT([$have_panel (CFLAGS: $PANEL_CFLAGS, LIBS: $PANEL_LIBS)])
|
||||
])
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From a56778372fe8dc7c42f5ffd911d89498c22dd064 Mon Sep 17 00:00:00 2001
|
||||
From 8e6dc9fe684b27988b5aca3f760f02343aa95951 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Hatle <mark.hatle@windriver.com>
|
||||
Date: Wed, 21 Sep 2011 20:55:33 -0500
|
||||
Subject: [PATCH] Lib/cgi.py: Update the script as mentioned in the comment
|
||||
@@ -6,7 +6,6 @@ Subject: [PATCH] Lib/cgi.py: Update the script as mentioned in the comment
|
||||
Upstream-Status: Inappropriate [distribution]
|
||||
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
|
||||
---
|
||||
Lib/cgi.py | 11 +----------
|
||||
1 file changed, 1 insertion(+), 10 deletions(-)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 5b66463c10fec1440e977d5a21a0167862d6d79c Mon Sep 17 00:00:00 2001
|
||||
From 1bc93167c48876d77ce424415e87573a062b8f2a Mon Sep 17 00:00:00 2001
|
||||
From: Ricardo Ribalda <ricardo@ribalda.com>
|
||||
Date: Tue, 18 Nov 2014 03:35:33 -0500
|
||||
Subject: [PATCH] configure.ac: add CROSSPYTHONPATH into PYTHONPATH for
|
||||
@@ -14,13 +14,12 @@ Upstream-Status: Inappropriate [OE-Core integration specific]
|
||||
Credits-to: Mark Hatle <mark.hatle@windriver.com>
|
||||
Credits-to: Jackie Huang <jackie.huang@windriver.com>
|
||||
Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com>
|
||||
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index cb9e198..d81c19a 100644
|
||||
index 093f8b5..cdc54e5 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -165,7 +165,7 @@ AC_ARG_WITH([build-python],
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 039d5e652796b55f1132afa568c7432b6ed89afd Mon Sep 17 00:00:00 2001
|
||||
From 38e732371ac234c3f0e6310d6dbc7ddc7f458535 Mon Sep 17 00:00:00 2001
|
||||
From: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
Date: Fri, 27 May 2022 17:05:44 +0100
|
||||
Subject: [PATCH] python3: Ensure stale empty python module directories don't
|
||||
@@ -13,13 +13,12 @@ As a result, patch this to a behaviour which works for us.
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/python/cpython/issues/120492; need to first talk to upstream to see if they'll take one or both fixes]
|
||||
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
|
||||
---
|
||||
Lib/importlib/metadata/__init__.py | 9 ++++++++-
|
||||
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Lib/importlib/metadata/__init__.py b/Lib/importlib/metadata/__init__.py
|
||||
index 82e0ce1..969cac4 100644
|
||||
index e6ca178..ac5a75b 100644
|
||||
--- a/Lib/importlib/metadata/__init__.py
|
||||
+++ b/Lib/importlib/metadata/__init__.py
|
||||
@@ -710,7 +710,14 @@ class Lookup:
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 9f827c29adbe656af3c8fc963fdd8f47aec0c442 Mon Sep 17 00:00:00 2001
|
||||
From 08c7867a02d26aac41764b915dc925343305e7af Mon Sep 17 00:00:00 2001
|
||||
From: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
Date: Tue, 13 Jul 2021 23:19:29 +0100
|
||||
Subject: [PATCH] python3: Fix make race
|
||||
@@ -17,10 +17,10 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
||||
index 381feb0..77bf09a 100644
|
||||
index 23e20e9..b1c5413 100644
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -2250,7 +2250,7 @@ COMPILEALL_OPTS=-j0
|
||||
@@ -2260,7 +2260,7 @@ COMPILEALL_OPTS=-j0
|
||||
TEST_MODULES=@TEST_MODULES@
|
||||
|
||||
.PHONY: libinstall
|
||||
|
||||
Reference in New Issue
Block a user