Merge branch 'master' into bug_notes_blank_env

conda-recipe/meta.yaml

@@ -40,7 +40,6 @@ requirements:
   - pyyaml
   - qdarkstyle
   - qtawesome
-  - qtconsole
   - qtpy
   - timechart >=1.2.4
   run_constrained:

docs/source/tools.rst

@@ -26,6 +26,5 @@ Tool Classes
 .. autosummary::
    :toctree: generated
 
-   TyphosConsole
    TyphosLogDisplay
    TyphosTimePlot

docs/source/upcoming_release_notes/538-remove_typhos_console.rst

@@ -0,0 +1,22 @@
+538 remove_typhos_console
+#########################
+
+API Changes
+-----------
+- The deprecated ``TyphosConsole`` has been removed as discussed in issue #538.
+
+Features
+--------
+- N/A
+
+Bugfixes
+--------
+- N/A
+
+Maintenance
+-----------
+- N/A
+
+Contributors
+------------
+- klauer

requirements.txt

@@ -11,6 +11,5 @@ pyqtgraph
 pyyaml
 qdarkstyle
 qtawesome
-qtconsole
 qtpy
 timechart

typhos/suite.py

@@ -17,7 +17,7 @@
 
 from . import utils, widgets
 from .display import DisplayTypes, ScrollOptions, TyphosDeviceDisplay
-from .tools import TyphosConsole, TyphosLogDisplay, TyphosTimePlot
+from .tools import TyphosLogDisplay, TyphosTimePlot
 from .utils import TyphosBase, clean_attr, clean_name, flatten_tree, save_suite
 
 logger = logging.getLogger(__name__)
@@ -238,9 +238,10 @@ class TyphosSuite(TyphosBase):
     DEFAULT_TITLE = 'Typhos Suite'
     DEFAULT_TITLE_DEVICE = 'Typhos Suite - {device.name}'
 
-    default_tools = {'Log': TyphosLogDisplay,
-                     'StripTool': TyphosTimePlot,
-                     'Console': TyphosConsole}
+    default_tools = {
+        "Log": TyphosLogDisplay,
+        "StripTool": TyphosTimePlot,
+    }
 
     def __init__(
         self,

typhos/tests/conftest.py

@@ -22,7 +22,7 @@
 import typhos
 from typhos.plugins.core import signal_registry
 from typhos.plugins.happi import register_client
-from typhos.utils import SignalRO, TyphosBase
+from typhos.utils import SignalRO
 
 logger = logging.getLogger(__name__)
 
@@ -33,11 +33,6 @@
 MODULE_PATH = pathlib.Path(__file__).parent
 
 
-# Patch TyphosConsole on TyphosSuite. Creation of more than one QtConsole
-# quicky in the test suite causes instabilities
-typhos.TyphosSuite.default_tools['Console'] = TyphosBase
-
-
 def pytest_addoption(parser):
     parser.addoption("--dark", action="store_true", default=False,
                      help="Use the dark stylesheet to display widgets")

typhos/tests/test_suite.py

@@ -43,7 +43,7 @@ def test_suite_without_children(device, qtbot):
 def test_suite_tools(device, qtbot):
     suite = TyphosSuite.from_device(device)
     qtbot.addWidget(suite)
-    assert len(suite.tools) == 3
+    assert len(suite.tools) == len(TyphosSuite.default_tools)
     assert len(suite.tools[0].devices) == 1
 
 

typhos/tools/__init__.py

@@ -1,9 +1,5 @@
 """Module for all insertable Typhos tools"""
-__all__ = ['TyphosConsole',
-           'TyphosLogDisplay',
-           'TyphosTimePlot'
-           ]
+__all__ = ["TyphosLogDisplay", "TyphosTimePlot"]
 
-from .console import TyphosConsole
 from .log import TyphosLogDisplay
 from .plot import TyphosTimePlot