Merge pull request #559 from dalthviz/fixes_issue_543

PR: Add support for IPython 9

Author: ccordoba12

pyproject.toml

@@ -35,8 +35,9 @@ requires-python = ">=3.9"
 dependencies = [
     "cloudpickle",
     "ipykernel>=6.29.3,<7",
-    "ipython>=8.13.0,<9,!=8.17.1",
+    "ipython>=8.13.0,<10,!=8.17.1,!=9.1.0,!=9.2.0,!=9.3.0,!=9.4.0",
     "jupyter-client>=7.4.9,<9",
+    "packaging",
     "pyxdg>=0.26;platform_system=='Linux'",
     "pyzmq>=24.0.0",
     # We need at least this version of traitlets to fix an error when setting

requirements/posix.txt

@@ -1,6 +1,6 @@
 cloudpickle
 ipykernel>=6.29.3,<7
-ipython>=8.12.2,<9
+ipython>=8.13.0,<10,!=8.17.1,!=9.1.0,!=9.2.0,!=9.3.0,!=9.4.0
 jupyter_client>=7.4.9,<9
 pyzmq>=24.0.0
 pyxdg>=0.26

requirements/windows.txt

@@ -1,6 +1,6 @@
 cloudpickle
 ipykernel>=6.29.3,<7
-ipython>=8.12.2,<9
+ipython>=8.13.0,<10,!=8.17.1,!=9.1.0,!=9.2.0,!=9.3.0,!=9.4.0
 jupyter_client>=7.4.9,<9
 pyzmq>=24.0.0
 traitlets>=5.14.3

spyder_kernels/console/kernel.py

@@ -27,6 +27,7 @@
 from ipykernel.ipkernel import IPythonKernel
 from ipykernel import get_connection_info
 from IPython.core import release as ipython_release
+from packaging.version import parse as parse_version
 from traitlets.config.loader import Config, LazyConfigValue
 import zmq
 from zmq.utils.garbage import gc
@@ -49,7 +50,7 @@
 from spyder_kernels.utils.mpl import automatic_backend, MPL_BACKENDS_TO_SPYDER
 from spyder_kernels.utils.nsview import (
     get_remote_data, make_remote_view, get_size)
-from spyder_kernels.utils.style import create_style_class
+from spyder_kernels.utils.style import create_pygments_dict, create_style_class
 from spyder_kernels.console.shell import SpyderShell
 from spyder_kernels.comms.utils import WriteContext
 
@@ -705,15 +706,37 @@ def set_traceback_highlighting(self, color_scheme):
 
     def set_traceback_syntax_highlighting(self, syntax_style):
         """Set the traceback syntax highlighting style."""
-        import IPython.core.ultratb
-        from IPython.core.ultratb import VerboseTB
+        if parse_version(ipython_release.version) >= parse_version("9.0"):
+            # Create spyder theme definition and set it (IPython 9.x+)
+            import IPython.utils.PyColorize
+            from IPython.utils.PyColorize import (
+                Theme,
+                linux_theme,
+                neutral_theme,
+            )
+
+            base = "default"
+            extra_style = neutral_theme.extra_style
+            if self.shell.get_spyder_theme() == "dark":
+                base = "monokai"
+                extra_style = linux_theme.extra_style
+
+            extra_style.update(create_pygments_dict(syntax_style))
+            theme = Theme("spyder_theme", base, extra_style)
+            IPython.utils.PyColorize.theme_table["spyder_theme"] = theme
+            self.shell.run_line_magic("colors", "spyder_theme")
+        else:
+            # Use `tb_highlight_style` class attribute to set the style (
+            # IPython 8.x)
+            import IPython.core.ultratb
+            from IPython.core.ultratb import VerboseTB
 
-        IPython.core.ultratb.get_style_by_name = create_style_class
+            IPython.core.ultratb.get_style_by_name = create_style_class
 
-        if getattr(VerboseTB, 'tb_highlight_style', None) is not None:
-            VerboseTB.tb_highlight_style = syntax_style
-        elif getattr(VerboseTB, '_tb_highlight_style', None) is not None:
-            VerboseTB._tb_highlight_style = syntax_style
+            if getattr(VerboseTB, "tb_highlight_style", None) is not None:
+                VerboseTB.tb_highlight_style = syntax_style
+            elif getattr(VerboseTB, "_tb_highlight_style", None) is not None:
+                VerboseTB._tb_highlight_style = syntax_style
 
     def get_cwd(self):
         """Get current working directory."""

spyder_kernels/console/shell.py

@@ -24,6 +24,9 @@
 
 # Third-party imports
 from ipykernel.zmqshell import ZMQInteractiveShell
+from IPython.core import release as ipython_release
+from packaging.version import parse as parse_version
+
 
 # Local imports
 from spyder_kernels.customize.namespace_manager import NamespaceManager
@@ -117,9 +120,11 @@ def _showtraceback(self, etype, evalue, stb):
             for line in stb:
                 if (
                     # Verbose mode
-                    re.match(r"File (.*)", line)
+                    re.match(r"File (.*)", line)  # IPython 8.x
+                    or re.match(r"\x1b(.*)File (.*)", line)  # IPython 9.x
                     # Plain mode
-                    or re.match(r"\x1b\[(.*)  File (.*)", line)
+                    or re.match(r"\x1b\[(.*)  File (.*)", line)  # IPython 8.x
+                    or re.match(r"  File (.*)", line)  # IPython 9.x
                 ) and (
                     # The file line should not contain a location where
                     # Spyder-kernels is installed
@@ -139,11 +144,11 @@ def _showtraceback(self, etype, evalue, stb):
     def set_spyder_theme(self, theme):
         """Set the theme for the console."""
         self._spyder_theme = theme
-        if theme == "dark":
-            # Needed to change the colors of tracebacks
-            self.run_line_magic("colors", "linux")
-        elif theme == "light":
-            self.run_line_magic("colors", "lightbg")
+
+        # Call `%colors` following theme for IPython 8.x tracebacks
+        if parse_version(ipython_release.version) < parse_version("9.0"):
+            colors = "linux" if theme == "dark" else "lightbg"
+            self.run_line_magic("colors", colors)
 
     def get_spyder_theme(self):
         """Get the theme for the console."""

spyder_kernels/console/start.py

@@ -16,6 +16,11 @@
 import sys
 import site
 
+# Third-party imports
+from IPython.core import release as ipython_release
+from packaging.version import parse as parse_version
+
+
 # Remove current directory from sys.path to prevent kernel crashes when people
 # name Python files or modules with the same name as standard library modules.
 # See spyder-ide/spyder#8007
@@ -101,6 +106,10 @@ def kernel_config():
     # To handle the banner by ourselves
     spy_cfg.ZMQInteractiveShell.banner1 = ''
 
+    # To disable tips (for the moment) that are only available in IPython 9.0+
+    if parse_version(ipython_release.version) >= parse_version("9.0"):
+        spy_cfg.ZMQInteractiveShell.enable_tip = False
+
     # Greedy completer
     greedy_o = os.environ.get('SPY_GREEDY_O') == 'True'
     spy_cfg.IPCompleter.greedy = greedy_o