diff --git a/qtconsole/ansi_code_processor.py b/qtconsole/ansi_code_processor.py index 1caec54c..063c9067 100644 --- a/qtconsole/ansi_code_processor.py +++ b/qtconsole/ansi_code_processor.py @@ -61,7 +61,7 @@ class AnsiCodeProcessor(object): # Whether to increase intensity or set boldness for SGR code 1. # (Different terminals handle this in different ways.) - bold_text_enabled = False + bold_text_enabled = True # We provide an empty default color map because subclasses will likely want # to use a custom color format. @@ -327,7 +327,7 @@ class QtAnsiCodeProcessor(AnsiCodeProcessor): 0 : 'black', # black 1 : 'darkred', # red 2 : 'darkgreen', # green - 3 : 'brown', # yellow + 3 : 'gold', # yellow 4 : 'darkblue', # blue 5 : 'darkviolet', # magenta 6 : 'steelblue', # cyan diff --git a/qtconsole/tests/test_ansi_code_processor.py b/qtconsole/tests/test_ansi_code_processor.py index 0bba7b51..2b7dd71f 100644 --- a/qtconsole/tests/test_ansi_code_processor.py +++ b/qtconsole/tests/test_ansi_code_processor.py @@ -2,13 +2,14 @@ import unittest # Local imports -from qtconsole.ansi_code_processor import AnsiCodeProcessor +from qtconsole.ansi_code_processor import AnsiCodeProcessor, QtAnsiCodeProcessor class TestAnsiCodeProcessor(unittest.TestCase): def setUp(self): self.processor = AnsiCodeProcessor() + self.qt_processor = QtAnsiCodeProcessor() def test_clear(self): """ Do control sequences for clearing the console work? @@ -37,7 +38,7 @@ def test_clear(self): def test_colors(self): """ Do basic controls sequences for colors work? """ - string = 'first\x1b[34mblue\x1b[0mlast' + string = 'first\x1b[34mblue\x1b[0mlast\033[33mYellow' i = -1 for i, substring in enumerate(self.processor.split_string(string)): if i == 0: @@ -49,9 +50,14 @@ def test_colors(self): elif i == 2: self.assertEqual(substring, 'last') self.assertEqual(self.processor.foreground_color, None) + elif i == 3: + foreground_color = self.processor.foreground_color + self.assertEqual(substring, 'Yellow') + self.assertEqual(foreground_color, 3) + self.assertEqual(self.qt_processor.get_color(foreground_color).name(), '#ffd700') else: self.fail('Too many substrings.') - self.assertEqual(i, 2, 'Too few substrings.') + self.assertEqual(i, 3, 'Too few substrings.') def test_colors_xterm(self): """ Do xterm-specific control sequences for colors work? diff --git a/qtconsole/tests/test_comms.py b/qtconsole/tests/test_comms.py index ec76e580..d12c17b5 100644 --- a/qtconsole/tests/test_comms.py +++ b/qtconsole/tests/test_comms.py @@ -1,3 +1,4 @@ +import os import time from queue import Empty import unittest @@ -11,6 +12,9 @@ class Tests(unittest.TestCase): def setUp(self): """Open a kernel.""" + # Prevent tests assertions related with message type from failing + # due to a debug warning + os.environ['PYDEVD_DISABLE_FILE_VALIDATION'] = '1' self.kernel_manager = QtKernelManager() self.kernel_manager.start_kernel() self.kernel_client = self.kernel_manager.client() diff --git a/requirements/environment.yml b/requirements/environment.yml index a3d7a5dc..b3681528 100644 --- a/requirements/environment.yml +++ b/requirements/environment.yml @@ -9,7 +9,6 @@ dependencies: - jupyter_client - pygments - ipykernel -- pyzmq >=17.1 # For testing - coveralls diff --git a/setup.py b/setup.py index a5968e6d..47b8729e 100644 --- a/setup.py +++ b/setup.py @@ -71,7 +71,6 @@ 'pygments', 'ipykernel>=4.1', # not a real dependency, but require the reference kernel 'qtpy>=2.4.0', - 'pyzmq>=17.1', 'packaging' ], extras_require = {