diff --git a/ipython-pr13466-display.patch b/ipython-pr13466-display.patch new file mode 100644 index 0000000..76b9110 --- /dev/null +++ b/ipython-pr13466-display.patch @@ -0,0 +1,44 @@ +From ad08da6f192d30fd1494b4d5fafbd480872e97e0 Mon Sep 17 00:00:00 2001 +From: Eric Prestat +Date: Sat, 15 Jan 2022 11:02:13 +0000 +Subject: [PATCH] Fix display import in .core.display + +--- + IPython/core/display.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/IPython/core/display.py b/IPython/core/display.py +index f3934c2d9d7..9db75035762 100644 +--- a/IPython/core/display.py ++++ b/IPython/core/display.py +@@ -83,7 +83,7 @@ def _display_mimetype(mimetype, objs, raw=False, metadata=None): + if raw: + # turn list of pngdata into list of { 'image/png': pngdata } + objs = [ {mimetype: obj} for obj in objs ] +- display(*objs, raw=raw, metadata=metadata, include=[mimetype]) ++ display_functions.display(*objs, raw=raw, metadata=metadata, include=[mimetype]) + + #----------------------------------------------------------------------------- + # Main functions +@@ -517,10 +517,10 @@ def _repr_html_(self): + self.html_width, self.total, self.progress) + + def display(self): +- display(self, display_id=self._display_id) ++ display_functions.display(self, display_id=self._display_id) + + def update(self): +- display(self, display_id=self._display_id, update=True) ++ display_functions.display(self, display_id=self._display_id, update=True) + + @property + def progress(self): +@@ -694,7 +694,7 @@ def _ipython_display_(self): + metadata = { + 'application/geo+json': self.metadata + } +- display(bundle, metadata=metadata, raw=True) ++ display_functions.display(bundle, metadata=metadata, raw=True) + + class Javascript(TextDisplayObject): + diff --git a/python-ipython.changes b/python-ipython.changes index 4b8fd73..8194160 100644 --- a/python-ipython.changes +++ b/python-ipython.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 3 20:32:01 UTC 2022 - Ben Greiner + +- Add ipython-pr13466-display.patch -- gh#ipython/ipython#13466 + * fixes plotly test failures + ------------------------------------------------------------------- Thu Jan 20 10:19:48 UTC 2022 - Ben Greiner diff --git a/python-ipython.spec b/python-ipython.spec index c738025..d30c95d 100644 --- a/python-ipython.spec +++ b/python-ipython.spec @@ -46,9 +46,11 @@ Source1: https://raw.githubusercontent.com/jupyter/qtconsole/4.0.0/qtcons Patch0: ipython-pr13282-py310-inspect.patch # PATCH-FIX-UPSTREAM ipython-pr13371-py310-oserror.patch -- gh#ipython/ipython#13371 Patch1: ipython-pr13371-py310-oserror.patch +# PATCH-FIX-UPSTREAM ipython-pr13466-display.patch -- gh#ipython/ipython#13466 +Patch2: https://github.com/ipython/ipython/pull/13466.patch#/ipython-pr13466-display.patch # PATCH-FIX-OPENSUSE skip-network-test.patch gh#ipython/ipython#13468 mcepl@suse.com # skip doctests requiring network connection -Patch2: skip-network-test.patch +Patch3: skip-network-test.patch BuildRequires: %pythons BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module setuptools >= 18.5}