From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6F41515802C for ; Fri, 20 Dec 2024 00:02:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C4B0E085A; Fri, 20 Dec 2024 00:02:34 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6485AE085A for ; Fri, 20 Dec 2024 00:02:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A205933BF36 for ; Fri, 20 Dec 2024 00:02:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DF1841EC5 for ; Fri, 20 Dec 2024 00:02:31 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1734652739.404bee8d79dc272a718132e5c138a8be2bab968d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/ipython/, dev-python/ipython/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/ipython/files/ipython-8.30.0-python3.13-debugger-pdb-curframe.patch dev-python/ipython/ipython-8.30.0-r1.ebuild dev-python/ipython/ipython-8.30.0.ebuild X-VCS-Directories: dev-python/ipython/ dev-python/ipython/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 404bee8d79dc272a718132e5c138a8be2bab968d X-VCS-Branch: master Date: Fri, 20 Dec 2024 00:02:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0b3635ca-f2dd-40c9-910a-df380e74219a X-Archives-Hash: b832cfdacfc9af60d1f6c3e4ef859256 commit: 404bee8d79dc272a718132e5c138a8be2bab968d Author: Gabi Falk gmx com> AuthorDate: Tue Dec 17 19:00:00 2024 +0000 Commit: Sam James gentoo org> CommitDate: Thu Dec 19 23:58:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=404bee8d dev-python/ipython: Backport upstream fix for python 3.13 regression The regression was detected by ipython's own testsuite. This part of the IPython code is expected to break again with python 3.14, because the curframe_locals attribute was removed in the PR cpython#124369. However, there are plans to restore this attribute for backward compatibility in PR cpython#125951 before the CPython 3.14 release. Url: https://github.com/ipython/ipython/pull/14598 Url: https://github.com/ipython/ipython/commit/c1e945b5bc8fb673109cf32c4f238f6d5e0f5149 Url: https://github.com/python/cpython/pull/124369 Url: https://github.com/python/cpython/pull/125951 Url: https://github.com/ipython/ipython/issues/14620 Closes: https://bugs.gentoo.org/946568 Signed-off-by: Gabi Falk gmx.com> Closes: https://github.com/gentoo/gentoo/pull/39746 Signed-off-by: Sam James gentoo.org> ...n-8.30.0-python3.13-debugger-pdb-curframe.patch | 30 ++++++++++++++++++++++ ...thon-8.30.0.ebuild => ipython-8.30.0-r1.ebuild} | 2 ++ 2 files changed, 32 insertions(+) diff --git a/dev-python/ipython/files/ipython-8.30.0-python3.13-debugger-pdb-curframe.patch b/dev-python/ipython/files/ipython-8.30.0-python3.13-debugger-pdb-curframe.patch new file mode 100644 index 000000000000..8e44fd3d0261 --- /dev/null +++ b/dev-python/ipython/files/ipython-8.30.0-python3.13-debugger-pdb-curframe.patch @@ -0,0 +1,30 @@ +FAILED IPython/core/tests/test_run.py::TestMagicRunPass::test_run_debug_twice - AttributeError: 'Pdb' object has no attribute 'curframe'. Did you mean: 'botframe'? +FAILED IPython/core/tests/test_run.py::TestMagicRunPass::test_run_debug_twice_with_breakpoint - AttributeError: 'Pdb' object has no attribute 'curframe'. Did you mean: 'botframe'? +https://bugs.gentoo.org/946568 +https://github.com/ipython/ipython/pull/14598 +https://github.com/ipython/ipython/commit/c1e945b5bc8fb673109cf32c4f238f6d5e0f5149.patch + +From c1e945b5bc8fb673109cf32c4f238f6d5e0f5149 Mon Sep 17 00:00:00 2001 +From: M Bussonnier +Date: Sun, 8 Dec 2024 11:37:11 +0100 +Subject: [PATCH] Fix pdb issues in Python 3.13.1 + +For some reason it is not always set, it was/is a bug in IPython to not +check. +--- + IPython/core/debugger.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py +index 1f0d7b2fba..76c42e0230 100644 +--- a/IPython/core/debugger.py ++++ b/IPython/core/debugger.py +@@ -550,7 +550,7 @@ def _get_frame_locals(self, frame): + So if frame is self.current_frame we instead return self.curframe_locals + + """ +- if frame is self.curframe: ++ if frame is getattr(self, "curframe", None): + return self.curframe_locals + else: + return frame.f_locals diff --git a/dev-python/ipython/ipython-8.30.0.ebuild b/dev-python/ipython/ipython-8.30.0-r1.ebuild similarity index 98% rename from dev-python/ipython/ipython-8.30.0.ebuild rename to dev-python/ipython/ipython-8.30.0-r1.ebuild index b67d14eb4763..8cae90959a59 100644 --- a/dev-python/ipython/ipython-8.30.0.ebuild +++ b/dev-python/ipython/ipython-8.30.0-r1.ebuild @@ -81,6 +81,8 @@ PDEPEND=" ) " +PATCHES=( "${FILESDIR}"/${P}-python3.13-debugger-pdb-curframe.patch ) # bug #946568 + python_prepare_all() { # Rename the test directory to reduce sys.path pollution # https://github.com/ipython/ipython/issues/12892