Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: Add ipython_pygments_lexers as a new dependency #23481

Merged
merged 4 commits into from
Jan 18, 2025
Merged

PR: Add ipython_pygments_lexers as a new dependency #23481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60fa8e6
IPython lexers are being split out as a separate package
takluyver Jan 16, 2025
337622f
Add ipython_pygments_lexers as dependency
takluyver Jan 16, 2025
9ea1249
Add ipython_pygments_lexers in remaining places
takluyver Jan 17, 2025
89b4686
Add minimum version of ipython_pygments_lexers
takluyver Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions binder/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions requirements/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
5 changes: 5 additions & 0 deletions spyder/dependencies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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"),
Expand Down
6 changes: 3 additions & 3 deletions spyder/plugins/ipythonconsole/widgets/debugging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading