Merge pull request #23481 from takluyver/patch-1

PR: Add `ipython_pygments_lexers` as a new dependency

binder/environment.yml

@@ -20,6 +20,7 @@ dependencies:
 - importlib-metadata >=4.6.0
 - intervaltree >=3.0.2
 - ipython >=8.13.0,<9.0.0,!=8.17.1
+- ipython_pygments_lexers >=1.0
 - jedi >=0.17.2,<0.20.0
 - jellyfish >=0.7
 - jsonschema >=3.2.0

requirements/main.yml

@@ -18,6 +18,7 @@ dependencies:
   - importlib-metadata >=4.6.0
   - intervaltree >=3.0.2
   - ipython >=8.13.0,<9.0.0,!=8.17.1
+  - ipython_pygments_lexers >=1.0
   - jedi >=0.17.2,<0.20.0
   - jellyfish >=0.7
   - jsonschema >=3.2.0

setup.py

@@ -278,6 +278,7 @@ def run(self):
     'intervaltree>=3.0.2',
     'ipython>=8.12.2,<8.13.0; python_version=="3.8"',
     'ipython>=8.13.0,<9.0.0,!=8.17.1; python_version>"3.8"',
+    'ipython_pygments_lexers>=1.0',
     'jedi>=0.17.2,<0.20.0',
     'jellyfish>=0.7',
     'jsonschema>=3.2.0',

spyder/dependencies.py

@@ -45,6 +45,7 @@
 IMPORTLIB_METADATA_REQVER = '>=4.6.0'
 INTERVALTREE_REQVER = '>=3.0.2'
 IPYTHON_REQVER = ">=8.12.2,<8.13.0" if PY38 else ">=8.13.0,<9.0.0,!=8.17.1"
+IPYTHON_PYGMENTS_LEXERS_REQVER = ">=1.0"
 JEDI_REQVER = '>=0.17.2,<0.20.0'
 JELLYFISH_REQVER = '>=0.7'
 JSONSCHEMA_REQVER = '>=3.2.0'
@@ -142,6 +143,10 @@
      'package_name': "IPython",
      'features': _("IPython interactive python environment"),
      'required_version': IPYTHON_REQVER},
+    {'modname': "ipython_pygments_lexers",
+     'package_name': "ipython_pygments_lexers",
+     'features': _("IPython lexers for syntax highlighting"),
+     'required_version': IPYTHON_PYGMENTS_LEXERS_REQVER},
     {'modname': "jedi",
      'package_name': "jedi",
      'features': _("Main backend for the Python Language Server"),

spyder/plugins/ipythonconsole/widgets/debugging.py

@@ -17,9 +17,9 @@
 # Third-party imports
 from IPython.core.history import HistoryManager
 from IPython.core.inputtransformer2 import TransformerManager
-from IPython.lib.lexers import (
-    IPython3Lexer, Python3Lexer, bygroups, using
-)
+from ipython_pygments_lexers import IPython3Lexer
+from pygments.lexer import bygroups, using
+from pygments.lexers import Python3Lexer
 from pygments.token import Keyword, Operator
 from pygments.util import ClassNotFound
 from qtconsole.rich_jupyter_widget import RichJupyterWidget