Merge branch 'jupyter:main' into shortcutTraitlets

RELEASE.md

@@ -16,7 +16,7 @@ To release a new version of qtconsole you need to follow these steps:
 
 * activate pyenv-with-latest-setuptools && python setup.py bdist_wheel
 
-* twine check dist/*
+* twine check --strict dist/*
 
 * twine upload dist/*
 
@@ -26,6 +26,6 @@ To release a new version of qtconsole you need to follow these steps:
 
 * git add and git commit with `Back to work`
 
-* git push upstream master
+* git push upstream main
 
 * git push upstream --tags

docs/source/changelog.rst

@@ -3,6 +3,29 @@
 Changes in Jupyter Qt console
 =============================
 
+.. _5.6:
+
+5.6
+~~~
+
+5.6.0
+-----
+
+`5.6.0 on GitHub <https://github.com/jupyter/qtconsole/milestones/5.6.0>`__
+
+Additions
++++++++++
+
+* Use selected syntax highlighting style for tracebacks and improve ANSI color
+  codes support.
+
+Changes
++++++++
+
+* Remove syntax highlighting support for Python 2.
+* Fix handling of carriage return.
+* Fix showing bold face characters in output when using ANSI codes.
+
 .. _5.5:
 
 5.5

qtconsole/_version.py

@@ -1,2 +1,2 @@
-version_info = (5, 6, 0, 'dev0')
+version_info = (5, 7, 0, 'dev0')
 __version__ = '.'.join(map(str, version_info))

qtconsole/jupyter_widget.py

@@ -14,7 +14,7 @@
 
 from qtpy import QtCore, QtGui
 
-from IPython.lib.lexers import IPythonLexer, IPython3Lexer
+from IPython.lib.lexers import IPython3Lexer
 from pygments.lexers import get_lexer_by_name
 from pygments.util import ClassNotFound
 from qtconsole import __version__
@@ -303,8 +303,6 @@ def _handle_kernel_info_reply(self, rep):
             # added here by hand.
             if pygments_lexer == 'ipython3':
                 lexer = IPython3Lexer()
-            elif pygments_lexer == 'ipython2':
-                lexer = IPythonLexer()
             else:
                 lexer = get_lexer_by_name(self.language_name)
             self._highlighter._lexer = lexer