Remove deprecated Qt modules and most other Qt-related code

glue-viz · Feb 27, 2024 · 5217e3c · 5217e3c
1 parent 5f38baf
commit 5217e3c
Show file tree

Hide file tree

Showing 120 changed files with 3 additions and 538 deletions.
diff --git a/README.rst b/README.rst
@@ -12,8 +12,8 @@ This repository contains the **glue-core** package which includes much of the co
 functionality of glue that is used for the different front-ends, including the Qt-based
 application and the Jupyter-based application. Other key repositories include:
 
-* `glue-qt <https://github.com/astrofrog/glue-qt/>`_: the original Qt/desktop application for glue
-* `glue-jupyter <https://github.com/astrofrog/glue-jupyter/>`_: a Jupyter front-end for glue
+* `glue-qt <https://github.com/glue-viz/glue-qt/>`_: the original Qt/desktop application for glue
+* `glue-jupyter <https://github.com/glue-viz/glue-jupyter/>`_: a Jupyter front-end for glue
 
 In addition to these, there are a number of plugin packages available. For a full list of repositories,
 see https://github.com/glue-viz/.

diff --git a/glue/__init__.py b/glue/__init__.py
@@ -21,13 +21,6 @@
 from .config import load_configuration
 env = load_configuration()
 
-
-def qglue(*args, **kwargs):
-    warnings.warn('glue.qglue is deprecated, import qglue from the glue_qt module instead', GlueDeprecationWarning)
-    from glue_qt import qglue
-    return qglue(*args, **kwargs)
-
-
 from .main import load_plugins  # noqa
 
 

diff --git a/glue/_mpl_backend.py b/glue/_mpl_backend.py
@@ -4,7 +4,7 @@
 
 class MatplotlibBackendSetter(object):
     """
-    Import hook to make sure the proper Qt backend is set when importing
+    Import hook to make sure the proper backend is set when importing
     Matplotlib.
     """
 

diff --git a/glue/app/qt/__init__.py b/glue/app/qt/__init__.py
diff --git a/glue/app/qt/actions.py b/glue/app/qt/actions.py
diff --git a/glue/app/qt/application.py b/glue/app/qt/application.py
diff --git a/glue/app/qt/edit_subset_mode_toolbar.py b/glue/app/qt/edit_subset_mode_toolbar.py
diff --git a/glue/app/qt/feedback.py b/glue/app/qt/feedback.py
diff --git a/glue/app/qt/keyboard_shortcuts.py b/glue/app/qt/keyboard_shortcuts.py
diff --git a/glue/app/qt/layer_tree_widget.py b/glue/app/qt/layer_tree_widget.py
diff --git a/glue/app/qt/mdi_area.py b/glue/app/qt/mdi_area.py
diff --git a/glue/app/qt/metadata.py b/glue/app/qt/metadata.py
diff --git a/glue/app/qt/plugin_manager.py b/glue/app/qt/plugin_manager.py
diff --git a/glue/app/qt/preferences.py b/glue/app/qt/preferences.py
diff --git a/glue/app/qt/save_data.py b/glue/app/qt/save_data.py
diff --git a/glue/app/qt/splash_screen.py b/glue/app/qt/splash_screen.py
diff --git a/glue/app/qt/terminal.py b/glue/app/qt/terminal.py
diff --git a/glue/app/qt/versions.py b/glue/app/qt/versions.py
diff --git a/glue/conftest.py b/glue/conftest.py
@@ -4,11 +4,6 @@
 
 import pytest
 
-try:
-    from qtpy import PYSIDE2
-except Exception:
-    PYSIDE2 = False
-
 from glue.config import CFG_DIR as CFG_DIR_ORIG
 
 try:
@@ -73,61 +68,3 @@ def pytest_unconfigure(config):
     # Reset configuration directory to original one
     from glue import config
     config.CFG_DIR = CFG_DIR_ORIG
-
-    # Remove reference to QApplication to prevent segmentation fault on PySide
-    try:
-        from glue.utils.qt import app
-        app.qapp = None
-    except Exception:  # for when we run the tests without the qt directories
-        # Note that we catch any exception, not just ImportError, because
-        # QtPy can raise a PythonQtError.
-        pass
-
-    if OBJGRAPH_INSTALLED and not ON_APPVEYOR:
-
-        # Make sure there are no lingering references to GlueApplication
-        obj = objgraph.by_type('GlueApplication')
-        if len(obj) > 0:
-            objgraph.show_backrefs(objgraph.by_type('GlueApplication'))
-            warnings.warn('There are {0} remaining references to GlueApplication'.format(len(obj)))
-
-        # Uncomment when checking for memory leaks
-        # objgraph.show_most_common_types(limit=100)
-
-
-# With PySide2, tests can fail in a non-deterministic way on a teardown error
-# or with the following error:
-#
-#   AttributeError: 'PySide2.QtGui.QStandardItem' object has no attribute '...'
-#
-# Until this can be properly debugged and fixed, we xfail any test that fails
-# with one of these exceptions.
-
-if PYSIDE2:
-    QTSTANDARD_EXC = "QtGui.QStandardItem' object has no attribute "
-    QTSTANDARD_ATTRS = ["'connect'", "'item'", "'triggered'"]
-
-    @pytest.hookimpl(hookwrapper=True)
-    def pytest_runtest_setup():
-        try:
-            outcome = yield
-            return outcome.get_result()
-        except AttributeError:
-            exc = str(outcome.excinfo[1])
-            for attr in QTSTANDARD_ATTRS:
-                if QTSTANDARD_EXC + attr in exc:
-                    pytest.xfail(f'Known issue {exc}')
-
-    @pytest.hookimpl(hookwrapper=True)
-    def pytest_runtest_call():
-        try:
-            outcome = yield
-            return outcome.get_result()
-        # excinfo seems only to be preserved through a single hook
-        except (AttributeError, ValueError):
-            exc = str(outcome.excinfo[1])
-            if "No net viewers should be created in tests" in exc:
-                pytest.xfail(f'Known issue {exc}')
-            for attr in QTSTANDARD_ATTRS:
-                if QTSTANDARD_EXC + attr in exc:
-                    pytest.xfail(f'Known issue {exc}')
diff --git a/glue/core/data_exporters/qt/__init__.py b/glue/core/data_exporters/qt/__init__.py
diff --git a/glue/core/data_exporters/qt/dialog.py b/glue/core/data_exporters/qt/dialog.py
diff --git a/glue/core/qt/__init__.py b/glue/core/qt/__init__.py
diff --git a/glue/core/qt/data_collection_model.py b/glue/core/qt/data_collection_model.py
diff --git a/glue/core/qt/dialogs.py b/glue/core/qt/dialogs.py
diff --git a/glue/core/qt/fitters.py b/glue/core/qt/fitters.py
diff --git a/glue/core/qt/layer_artist_model.py b/glue/core/qt/layer_artist_model.py
diff --git a/glue/core/qt/message_widget.py b/glue/core/qt/message_widget.py
diff --git a/glue/core/qt/mime.py b/glue/core/qt/mime.py
diff --git a/glue/core/qt/simpleforms.py b/glue/core/qt/simpleforms.py
diff --git a/glue/core/qt/style_dialog.py b/glue/core/qt/style_dialog.py
diff --git a/glue/dialogs/autolinker/qt/__init__.py b/glue/dialogs/autolinker/qt/__init__.py
diff --git a/glue/dialogs/autolinker/qt/autolinker.py b/glue/dialogs/autolinker/qt/autolinker.py
diff --git a/glue/dialogs/common/qt/__init__.py b/glue/dialogs/common/qt/__init__.py
diff --git a/glue/dialogs/common/qt/component_tree_widget.py b/glue/dialogs/common/qt/component_tree_widget.py
diff --git a/glue/dialogs/component_arithmetic/qt/__init__.py b/glue/dialogs/component_arithmetic/qt/__init__.py
diff --git a/glue/dialogs/component_arithmetic/qt/component_arithmetic.py b/glue/dialogs/component_arithmetic/qt/component_arithmetic.py
diff --git a/glue/dialogs/component_arithmetic/qt/equation_editor.py b/glue/dialogs/component_arithmetic/qt/equation_editor.py
diff --git a/glue/dialogs/component_manager/qt/__init__.py b/glue/dialogs/component_manager/qt/__init__.py
diff --git a/glue/dialogs/component_manager/qt/component_manager.py b/glue/dialogs/component_manager/qt/component_manager.py
diff --git a/glue/dialogs/data_wizard/qt/__init__.py b/glue/dialogs/data_wizard/qt/__init__.py
diff --git a/glue/dialogs/data_wizard/qt/data_wizard_dialog.py b/glue/dialogs/data_wizard/qt/data_wizard_dialog.py
diff --git a/glue/dialogs/link_editor/qt/__init__.py b/glue/dialogs/link_editor/qt/__init__.py
diff --git a/glue/dialogs/link_editor/qt/data_graph.py b/glue/dialogs/link_editor/qt/data_graph.py
diff --git a/glue/dialogs/link_editor/qt/link_editor.py b/glue/dialogs/link_editor/qt/link_editor.py
diff --git a/glue/dialogs/subset_facet/qt/__init__.py b/glue/dialogs/subset_facet/qt/__init__.py
diff --git a/glue/dialogs/subset_facet/qt/subset_facet.py b/glue/dialogs/subset_facet/qt/subset_facet.py
diff --git a/glue/icons/qt/__init__.py b/glue/icons/qt/__init__.py
diff --git a/glue/icons/qt/helpers.py b/glue/icons/qt/helpers.py
diff --git a/glue/io/qt/__init__.py b/glue/io/qt/__init__.py
diff --git a/glue/io/qt/directory_importer/__init__.py b/glue/io/qt/directory_importer/__init__.py
diff --git a/glue/io/qt/directory_importer/directory_importer.py b/glue/io/qt/directory_importer/directory_importer.py
diff --git a/glue/io/qt/subset_mask.py b/glue/io/qt/subset_mask.py
diff --git a/glue/plugins/dendro_viewer/qt/__init__.py b/glue/plugins/dendro_viewer/qt/__init__.py
diff --git a/glue/plugins/dendro_viewer/qt/data_viewer.py b/glue/plugins/dendro_viewer/qt/data_viewer.py
diff --git a/glue/plugins/dendro_viewer/qt/layer_style_editor.py b/glue/plugins/dendro_viewer/qt/layer_style_editor.py
diff --git a/glue/plugins/dendro_viewer/qt/options_widget.py b/glue/plugins/dendro_viewer/qt/options_widget.py
diff --git a/glue/plugins/tools/pv_slicer/qt/__init__.py b/glue/plugins/tools/pv_slicer/qt/__init__.py
diff --git a/glue/plugins/tools/pv_slicer/qt/pv_slicer.py b/glue/plugins/tools/pv_slicer/qt/pv_slicer.py
diff --git a/glue/utils/qt/__init__.py b/glue/utils/qt/__init__.py
diff --git a/glue/utils/qt/app.py b/glue/utils/qt/app.py
diff --git a/glue/utils/qt/autocomplete_widget.py b/glue/utils/qt/autocomplete_widget.py
diff --git a/glue/utils/qt/colors.py b/glue/utils/qt/colors.py