Merge remote-tracking branch 'upstream/main' into gh-13845-fix-pygments-entry-points

IPython/lib/tests/test_pygments.py

@@ -0,0 +1,26 b''
+from typing import List
+
+import pytest
+import pygments.lexers
+import pygments.lexer
+
+from IPython.lib.lexers import IPythonConsoleLexer, IPythonLexer, IPython3Lexer
+
+#: the human-readable names of the IPython lexers with ``entry_points``
+EXPECTED_LEXER_NAMES = [
+    cls.name for cls in [IPythonConsoleLexer, IPythonLexer, IPython3Lexer]
+]
+
+
[e-mail]
+def all_pygments_lexer_names() -> List[str]:
+    """Get all lexer names registered in pygments."""
+    return {l[0] for l in pygments.lexers.get_all_lexers()}
+
+
[e-mail]("expected_lexer", EXPECTED_LEXER_NAMES)
+def test_pygments_entry_points(
+    expected_lexer: str, all_pygments_lexer_names: List[str]
+) -> None:
+    """Check whether the ``entry_points`` for ``pygments.lexers`` are correct."""
+    assert expected_lexer in all_pygments_lexer_names

IPython/core/release.py

@@ -16,11 +16,11 b''
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 8
-_version_minor = 7
+_version_minor = 8
 _version_patch = 0
 _version_extra = ".dev"
 # _version_extra = "rc1"
-_version_extra = ""  # Uncomment this for full releases
+# _version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

setup.py

@@ -146,7 +146,7 b' setup_args["entry_points"] = {'
         "ipythonconsole = IPython.lib.lexers:IPythonConsoleLexer",
         "ipython = IPython.lib.lexers:IPythonLexer",
         "ipython3 = IPython.lib.lexers:IPython3Lexer",
-    ]
+    ],
 }
 
 #---------------------------------------------------------------------------