Skip to content

Commit 4e011e6

Browse files
tornariajmilne22
authored andcommitted
python3-ipython_ipykernel: patches for ipython 9.0
Closes: void-linux#54616 [via git-merge-pr]
1 parent 7566945 commit 4e011e6

4 files changed

Lines changed: 94 additions & 1 deletion

File tree

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
From 4854752dc86e0e823c2a114e7ca68cecb76af442 Mon Sep 17 00:00:00 2001
2+
From: M Bussonnier <bussonniermatthias@gmail.com>
3+
Date: Mon, 24 Feb 2025 09:46:46 +0100
4+
Subject: [PATCH] Fix expected text depending on IPython version. (#1354)
5+
6+
---
7+
tests/test_start_kernel.py | 10 +++++++++-
8+
1 file changed, 9 insertions(+), 1 deletion(-)
9+
10+
diff --git a/tests/test_start_kernel.py b/tests/test_start_kernel.py
11+
index f2a632be0..71f4bdc0a 100644
12+
--- a/tests/test_start_kernel.py
13+
+++ b/tests/test_start_kernel.py
14+
@@ -14,6 +14,14 @@
15+
16+
@flaky(max_runs=3)
17+
def test_ipython_start_kernel_userns():
18+
+ import IPython
19+
+
20+
+ if IPython.version_info > (9, 0): # noqa:SIM108
21+
+ EXPECTED = "IPythonMainModule"
22+
+ else:
23+
+ # not this since https://github.com/ipython/ipython/pull/14754
24+
+ EXPECTED = "DummyMod"
25+
+
26+
cmd = dedent(
27+
"""
28+
from ipykernel.kernelapp import launch_new_instance
29+
@@ -40,7 +48,7 @@ def test_ipython_start_kernel_userns():
30+
content = msg["content"]
31+
assert content["found"]
32+
text = content["data"]["text/plain"]
33+
- assert "DummyMod" in text
34+
+ assert EXPECTED in text
35+
36+
37+
@flaky(max_runs=3)
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
From https://github.com/ipython/ipykernel/pull/1390
2+
3+
From 05ee4fd4630020a3a13895bfddd16ddcfc423387 Mon Sep 17 00:00:00 2001
4+
From: Ian Thomas <ianthomas23@gmail.com>
5+
Date: Fri, 11 Apr 2025 10:25:39 +0100
6+
Subject: [PATCH] Fix embed kernel (taken from #1322)
7+
8+
---
9+
ipykernel/embed.py | 3 ++-
10+
1 file changed, 2 insertions(+), 1 deletion(-)
11+
12+
diff --git a/ipykernel/embed.py b/ipykernel/embed.py
13+
index 3e4abd390..d2cbe60b4 100644
14+
--- a/ipykernel/embed.py
15+
+++ b/ipykernel/embed.py
16+
@@ -49,9 +49,10 @@ def embed_kernel(module=None, local_ns=None, **kwargs):
17+
if module is None:
18+
module = caller_module
19+
if local_ns is None:
20+
- local_ns = caller_locals
21+
+ local_ns = dict(**caller_locals)
22+
23+
app.kernel.user_module = module
24+
+ assert isinstance(local_ns, dict)
25+
app.kernel.user_ns = local_ns
26+
app.shell.set_completer_frame() # type:ignore[union-attr]
27+
app.start()
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
From https://github.com/ipython/ipykernel/pull/1390
2+
3+
From 991068ddc26cc0078ec6466897bb4f84869e7068 Mon Sep 17 00:00:00 2001
4+
From: Ian Thomas <ianthomas23@gmail.com>
5+
Date: Thu, 10 Apr 2025 13:36:43 +0100
6+
Subject: [PATCH] Remove welcome_message arg from enable_pylab
7+
8+
---
9+
ipykernel/inprocess/ipkernel.py | 4 ++--
10+
1 file changed, 2 insertions(+), 2 deletions(-)
11+
12+
diff --git a/ipykernel/inprocess/ipkernel.py b/ipykernel/inprocess/ipkernel.py
13+
index 873b96d20..320b739b6 100644
14+
--- a/ipykernel/inprocess/ipkernel.py
15+
+++ b/ipykernel/inprocess/ipkernel.py
16+
@@ -193,11 +193,11 @@ def enable_matplotlib(self, gui=None):
17+
gui = self.kernel.gui
18+
return super().enable_matplotlib(gui)
19+
20+
- def enable_pylab(self, gui=None, import_all=True, welcome_message=False):
21+
+ def enable_pylab(self, gui=None, import_all=True):
22+
"""Activate pylab support at runtime."""
23+
if not gui:
24+
gui = self.kernel.gui
25+
- return super().enable_pylab(gui, import_all, welcome_message)
26+
+ return super().enable_pylab(gui, import_all)
27+
28+
29+
InteractiveShellABC.register(InProcessInteractiveShell)

srcpkgs/python3-ipython_ipykernel/template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Template file for 'python3-ipython_ipykernel'
22
pkgname=python3-ipython_ipykernel
33
version=6.29.5
4-
revision=3
4+
revision=4
55
build_style=python3-pep517
66
# run all tests available
77
make_check_target="tests"

0 commit comments

Comments
 (0)