diff --git a/README.rst b/README.rst index a0a9d020d..421b92126 100644 --- 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 `_: the original Qt/desktop application for glue -* `glue-jupyter `_: a Jupyter front-end for glue +* `glue-qt `_: the original Qt/desktop application for glue +* `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 index 8e0a8839e..91883381d 100644 --- a/glue/__init__.py +++ b/glue/__init__.py @@ -1,11 +1,10 @@ # Set up configuration variables -__all__ = ['custom_viewer', 'qglue', 'test'] +__all__ = ['custom_viewer', 'test'] import os import sys -import warnings import importlib.metadata @@ -15,19 +14,11 @@ sys.meta_path.append(MatplotlibBackendSetter()) from glue.viewers.custom.helper import custom_viewer -from glue.utils.error import GlueDeprecationWarning # Load user's configuration file 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 index 0069c3fff..1b464a732 100644 --- 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 deleted file mode 100644 index c8a89500b..000000000 --- a/glue/app/qt/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.app.qt is deprecated, use glue_qt.app instead', GlueDeprecationWarning) -from glue_qt.app import * # noqa diff --git a/glue/app/qt/actions.py b/glue/app/qt/actions.py deleted file mode 100644 index 070bb1d7b..000000000 --- a/glue/app/qt/actions.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.app.qt.actions is deprecated, use glue_qt.app.actions instead', GlueDeprecationWarning) -from glue_qt.app.actions import * # noqa diff --git a/glue/app/qt/application.py b/glue/app/qt/application.py deleted file mode 100644 index 4f59db281..000000000 --- a/glue/app/qt/application.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.app.qt.application is deprecated, use glue_qt.app.application instead', GlueDeprecationWarning) -from glue_qt.app.application import * # noqa diff --git a/glue/app/qt/edit_subset_mode_toolbar.py b/glue/app/qt/edit_subset_mode_toolbar.py deleted file mode 100644 index 417a14ea3..000000000 --- a/glue/app/qt/edit_subset_mode_toolbar.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.app.qt.edit_subset_mode_toolbar is deprecated, use glue_qt.app.edit_subset_mode_toolbar instead', GlueDeprecationWarning) -from glue_qt.app.edit_subset_mode_toolbar import * # noqa diff --git a/glue/app/qt/feedback.py b/glue/app/qt/feedback.py deleted file mode 100644 index 0750eb2bb..000000000 --- a/glue/app/qt/feedback.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.app.qt.feedback is deprecated, use glue_qt.app.feedback instead', GlueDeprecationWarning) -from glue_qt.app.feedback import * # noqa diff --git a/glue/app/qt/keyboard_shortcuts.py b/glue/app/qt/keyboard_shortcuts.py deleted file mode 100644 index 5c3917eee..000000000 --- a/glue/app/qt/keyboard_shortcuts.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.app.qt.keyboard_shortcuts is deprecated, use glue_qt.app.keyboard_shortcuts instead', GlueDeprecationWarning) -from glue_qt.app.keyboard_shortcuts import * # noqa diff --git a/glue/app/qt/layer_tree_widget.py b/glue/app/qt/layer_tree_widget.py deleted file mode 100644 index c1d0b0910..000000000 --- a/glue/app/qt/layer_tree_widget.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.app.qt.layer_tree_widget is deprecated, use glue_qt.app.layer_tree_widget instead', GlueDeprecationWarning) -from glue_qt.app.layer_tree_widget import * # noqa diff --git a/glue/app/qt/mdi_area.py b/glue/app/qt/mdi_area.py deleted file mode 100644 index 54092e4ab..000000000 --- a/glue/app/qt/mdi_area.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.app.qt.mdi_area is deprecated, use glue_qt.app.mdi_area instead', GlueDeprecationWarning) -from glue_qt.app.mdi_area import * # noqa diff --git a/glue/app/qt/metadata.py b/glue/app/qt/metadata.py deleted file mode 100644 index 44ace5293..000000000 --- a/glue/app/qt/metadata.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.app.qt.metadata is deprecated, use glue_qt.app.metadata instead', GlueDeprecationWarning) -from glue_qt.app.metadata import * # noqa diff --git a/glue/app/qt/plugin_manager.py b/glue/app/qt/plugin_manager.py deleted file mode 100644 index 7ba92f677..000000000 --- a/glue/app/qt/plugin_manager.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.app.qt.plugin_manager is deprecated, use glue_qt.app.plugin_manager instead', GlueDeprecationWarning) -from glue_qt.app.plugin_manager import * # noqa diff --git a/glue/app/qt/preferences.py b/glue/app/qt/preferences.py deleted file mode 100644 index 30383ddba..000000000 --- a/glue/app/qt/preferences.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.app.qt.preferences is deprecated, use glue_qt.app.preferences instead', GlueDeprecationWarning) -from glue_qt.app.preferences import * # noqa diff --git a/glue/app/qt/save_data.py b/glue/app/qt/save_data.py deleted file mode 100644 index b755a9430..000000000 --- a/glue/app/qt/save_data.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.app.qt.save_data is deprecated, use glue_qt.app.save_data instead', GlueDeprecationWarning) -from glue_qt.app.save_data import * # noqa diff --git a/glue/app/qt/splash_screen.py b/glue/app/qt/splash_screen.py deleted file mode 100644 index 6cf0f7315..000000000 --- a/glue/app/qt/splash_screen.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.app.qt.splash_screen is deprecated, use glue_qt.app.splash_screen instead', GlueDeprecationWarning) -from glue_qt.app.splash_screen import * # noqa diff --git a/glue/app/qt/terminal.py b/glue/app/qt/terminal.py deleted file mode 100644 index eae551147..000000000 --- a/glue/app/qt/terminal.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.app.qt.terminal is deprecated, use glue_qt.app.terminal instead', GlueDeprecationWarning) -from glue_qt.app.terminal import * # noqa diff --git a/glue/app/qt/versions.py b/glue/app/qt/versions.py deleted file mode 100644 index cabf25c3d..000000000 --- a/glue/app/qt/versions.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.app.qt.versions is deprecated, use glue_qt.app.versions instead', GlueDeprecationWarning) -from glue_qt.app.versions import * # noqa diff --git a/glue/conftest.py b/glue/conftest.py index 73a745cf3..e0e0251b1 100644 --- a/glue/conftest.py +++ b/glue/conftest.py @@ -1,24 +1,8 @@ import os import sys -import warnings - -import pytest - -try: - from qtpy import PYSIDE2 -except Exception: - PYSIDE2 = False from glue.config import CFG_DIR as CFG_DIR_ORIG -try: - import objgraph -except ImportError: - OBJGRAPH_INSTALLED = False -else: - OBJGRAPH_INSTALLED = True - - STDERR_ORIGINAL = sys.stderr ON_APPVEYOR = os.environ.get('APPVEYOR', 'False') == 'True' @@ -73,61 +57,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 deleted file mode 100644 index 87cca1e92..000000000 --- a/glue/core/data_exporters/qt/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.core.data_exporters.qt is deprecated, use glue_qt.core.data_exporters instead', GlueDeprecationWarning) -from glue_qt.core.data_exporters import * # noqa diff --git a/glue/core/data_exporters/qt/dialog.py b/glue/core/data_exporters/qt/dialog.py deleted file mode 100644 index 88e4fb38f..000000000 --- a/glue/core/data_exporters/qt/dialog.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.core.data_exporters.qt.dialog is deprecated, use glue_qt.core.data_exporters.dialog instead', GlueDeprecationWarning) -from glue_qt.core.data_exporters.dialog import * # noqa diff --git a/glue/core/qt/__init__.py b/glue/core/qt/__init__.py deleted file mode 100644 index 52b7c076a..000000000 --- a/glue/core/qt/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.core.qt is deprecated, use glue_qt.core instead', GlueDeprecationWarning) -from glue_qt.core import * # noqa diff --git a/glue/core/qt/data_collection_model.py b/glue/core/qt/data_collection_model.py deleted file mode 100644 index 78300433e..000000000 --- a/glue/core/qt/data_collection_model.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.core.qt.data_collection_model is deprecated, use glue_qt.core.data_collection_model instead', GlueDeprecationWarning) -from glue_qt.core.data_collection_model import * # noqa diff --git a/glue/core/qt/dialogs.py b/glue/core/qt/dialogs.py deleted file mode 100644 index 117ecd691..000000000 --- a/glue/core/qt/dialogs.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.core.qt.dialogs is deprecated, use glue_qt.core.dialogs instead', GlueDeprecationWarning) -from glue_qt.core.dialogs import * # noqa diff --git a/glue/core/qt/fitters.py b/glue/core/qt/fitters.py deleted file mode 100644 index 54bb772cc..000000000 --- a/glue/core/qt/fitters.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.core.qt.fitters is deprecated, use glue_qt.core.fitters instead', GlueDeprecationWarning) -from glue_qt.core.fitters import * # noqa diff --git a/glue/core/qt/layer_artist_model.py b/glue/core/qt/layer_artist_model.py deleted file mode 100644 index af0a56455..000000000 --- a/glue/core/qt/layer_artist_model.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.core.qt.layer_artist_model is deprecated, use glue_qt.core.layer_artist_model instead', GlueDeprecationWarning) -from glue_qt.core.layer_artist_model import * # noqa diff --git a/glue/core/qt/message_widget.py b/glue/core/qt/message_widget.py deleted file mode 100644 index 2fe5fc3dd..000000000 --- a/glue/core/qt/message_widget.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.core.qt.message_widget is deprecated, use glue_qt.core.message_widget instead', GlueDeprecationWarning) -from glue_qt.core.message_widget import * # noqa diff --git a/glue/core/qt/mime.py b/glue/core/qt/mime.py deleted file mode 100644 index 4909c48f4..000000000 --- a/glue/core/qt/mime.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.core.qt.mime is deprecated, use glue_qt.core.mime instead', GlueDeprecationWarning) -from glue_qt.core.mime import * # noqa diff --git a/glue/core/qt/simpleforms.py b/glue/core/qt/simpleforms.py deleted file mode 100644 index e4be6effa..000000000 --- a/glue/core/qt/simpleforms.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.core.qt.simpleforms is deprecated, use glue_qt.core.simpleforms instead', GlueDeprecationWarning) -from glue_qt.core.simpleforms import * # noqa diff --git a/glue/core/qt/style_dialog.py b/glue/core/qt/style_dialog.py deleted file mode 100644 index 71e6c438a..000000000 --- a/glue/core/qt/style_dialog.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.core.qt.style_dialog is deprecated, use glue_qt.core.style_dialog instead', GlueDeprecationWarning) -from glue_qt.core.style_dialog import * # noqa diff --git a/glue/dialogs/autolinker/qt/__init__.py b/glue/dialogs/autolinker/qt/__init__.py deleted file mode 100644 index 7c5364e0d..000000000 --- a/glue/dialogs/autolinker/qt/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.dialogs.autolinker.qt is deprecated, use glue_qt.dialogs.autolinker instead', GlueDeprecationWarning) -from glue_qt.dialogs.autolinker import * # noqa diff --git a/glue/dialogs/autolinker/qt/autolinker.py b/glue/dialogs/autolinker/qt/autolinker.py deleted file mode 100644 index bbe79aeb2..000000000 --- a/glue/dialogs/autolinker/qt/autolinker.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.dialogs.autolinker.qt.autolinker is deprecated, use glue_qt.dialogs.autolinker.autolinker instead', GlueDeprecationWarning) -from glue_qt.dialogs.autolinker.autolinker import * # noqa diff --git a/glue/dialogs/common/qt/__init__.py b/glue/dialogs/common/qt/__init__.py deleted file mode 100644 index 1326b992f..000000000 --- a/glue/dialogs/common/qt/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.dialogs.common.qt is deprecated, use glue_qt.dialogs.common instead', GlueDeprecationWarning) -from glue_qt.dialogs.common import * # noqa diff --git a/glue/dialogs/common/qt/component_tree_widget.py b/glue/dialogs/common/qt/component_tree_widget.py deleted file mode 100644 index 29e288f19..000000000 --- a/glue/dialogs/common/qt/component_tree_widget.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.dialogs.common.qt.component_tree_widget is deprecated, use glue_qt.dialogs.common.component_tree_widget instead', GlueDeprecationWarning) -from glue_qt.dialogs.common.component_tree_widget import * # noqa diff --git a/glue/dialogs/component_arithmetic/qt/__init__.py b/glue/dialogs/component_arithmetic/qt/__init__.py deleted file mode 100644 index 8a23b3bc1..000000000 --- a/glue/dialogs/component_arithmetic/qt/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.dialogs.component_arithmetic.qt is deprecated, use glue_qt.dialogs.component_arithmetic instead', GlueDeprecationWarning) -from glue_qt.dialogs.component_arithmetic import * # noqa diff --git a/glue/dialogs/component_arithmetic/qt/component_arithmetic.py b/glue/dialogs/component_arithmetic/qt/component_arithmetic.py deleted file mode 100644 index 7b9b34340..000000000 --- a/glue/dialogs/component_arithmetic/qt/component_arithmetic.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.dialogs.component_arithmetic.qt.component_arithmetic is deprecated, use glue_qt.dialogs.component_arithmetic.component_arithmetic instead', GlueDeprecationWarning) -from glue_qt.dialogs.component_arithmetic.component_arithmetic import * # noqa diff --git a/glue/dialogs/component_arithmetic/qt/equation_editor.py b/glue/dialogs/component_arithmetic/qt/equation_editor.py deleted file mode 100644 index 7138cd6ef..000000000 --- a/glue/dialogs/component_arithmetic/qt/equation_editor.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.dialogs.component_arithmetic.qt.equation_editor is deprecated, use glue_qt.dialogs.component_arithmetic.equation_editor instead', GlueDeprecationWarning) -from glue_qt.dialogs.component_arithmetic.equation_editor import * # noqa diff --git a/glue/dialogs/component_manager/qt/__init__.py b/glue/dialogs/component_manager/qt/__init__.py deleted file mode 100644 index 50c6717e4..000000000 --- a/glue/dialogs/component_manager/qt/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.dialogs.component_manager.qt is deprecated, use glue_qt.dialogs.component_manager instead', GlueDeprecationWarning) -from glue_qt.dialogs.component_manager import * # noqa diff --git a/glue/dialogs/component_manager/qt/component_manager.py b/glue/dialogs/component_manager/qt/component_manager.py deleted file mode 100644 index 68e398a90..000000000 --- a/glue/dialogs/component_manager/qt/component_manager.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.dialogs.component_manager.qt.component_manager is deprecated, use glue_qt.dialogs.component_manager.component_manager instead', GlueDeprecationWarning) -from glue_qt.dialogs.component_manager.component_manager import * # noqa diff --git a/glue/dialogs/data_wizard/qt/__init__.py b/glue/dialogs/data_wizard/qt/__init__.py deleted file mode 100644 index 108d86cab..000000000 --- a/glue/dialogs/data_wizard/qt/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.dialogs.data_wizard.qt is deprecated, use glue_qt.dialogs.data_wizard instead', GlueDeprecationWarning) -from glue_qt.dialogs.data_wizard import * # noqa diff --git a/glue/dialogs/data_wizard/qt/data_wizard_dialog.py b/glue/dialogs/data_wizard/qt/data_wizard_dialog.py deleted file mode 100644 index 9b1789158..000000000 --- a/glue/dialogs/data_wizard/qt/data_wizard_dialog.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.dialogs.data_wizard.qt.data_wizard_dialog is deprecated, use glue_qt.dialogs.data_wizard.data_wizard_dialog instead', GlueDeprecationWarning) -from glue_qt.dialogs.data_wizard.data_wizard_dialog import * # noqa diff --git a/glue/dialogs/link_editor/qt/__init__.py b/glue/dialogs/link_editor/qt/__init__.py deleted file mode 100644 index 558162ed5..000000000 --- a/glue/dialogs/link_editor/qt/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.dialogs.link_editor.qt is deprecated, use glue_qt.dialogs.link_editor instead', GlueDeprecationWarning) -from glue_qt.dialogs.link_editor import * # noqa diff --git a/glue/dialogs/link_editor/qt/data_graph.py b/glue/dialogs/link_editor/qt/data_graph.py deleted file mode 100644 index e4d3e0378..000000000 --- a/glue/dialogs/link_editor/qt/data_graph.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.dialogs.link_editor.qt.data_graph is deprecated, use glue_qt.dialogs.link_editor.data_graph instead', GlueDeprecationWarning) -from glue_qt.dialogs.link_editor.data_graph import * # noqa diff --git a/glue/dialogs/link_editor/qt/link_editor.py b/glue/dialogs/link_editor/qt/link_editor.py deleted file mode 100644 index 39f5690e2..000000000 --- a/glue/dialogs/link_editor/qt/link_editor.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.dialogs.link_editor.qt.link_editor is deprecated, use glue_qt.dialogs.link_editor.link_editor instead', GlueDeprecationWarning) -from glue_qt.dialogs.link_editor.link_editor import * # noqa diff --git a/glue/dialogs/subset_facet/qt/__init__.py b/glue/dialogs/subset_facet/qt/__init__.py deleted file mode 100644 index 92878f2e1..000000000 --- a/glue/dialogs/subset_facet/qt/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.dialogs.subset_facet.qt is deprecated, use glue_qt.dialogs.subset_facet instead', GlueDeprecationWarning) -from glue_qt.dialogs.subset_facet import * # noqa diff --git a/glue/dialogs/subset_facet/qt/subset_facet.py b/glue/dialogs/subset_facet/qt/subset_facet.py deleted file mode 100644 index b5dd57673..000000000 --- a/glue/dialogs/subset_facet/qt/subset_facet.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.dialogs.subset_facet.qt.subset_facet is deprecated, use glue_qt.dialogs.subset_facet.subset_facet instead', GlueDeprecationWarning) -from glue_qt.dialogs.subset_facet.subset_facet import * # noqa diff --git a/glue/icons/qt/__init__.py b/glue/icons/qt/__init__.py deleted file mode 100644 index 95a08bec4..000000000 --- a/glue/icons/qt/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.icons.qt is deprecated, use glue_qt.icons instead', GlueDeprecationWarning) -from glue_qt.icons import * # noqa diff --git a/glue/icons/qt/helpers.py b/glue/icons/qt/helpers.py deleted file mode 100644 index 46996b1d5..000000000 --- a/glue/icons/qt/helpers.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.icons.qt.helpers is deprecated, use glue_qt.icons.helpers instead', GlueDeprecationWarning) -from glue_qt.icons.helpers import * # noqa diff --git a/glue/io/qt/__init__.py b/glue/io/qt/__init__.py deleted file mode 100644 index a40e02085..000000000 --- a/glue/io/qt/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.io.qt is deprecated, use glue_qt.io instead', GlueDeprecationWarning) -from glue_qt.io import * # noqa diff --git a/glue/io/qt/directory_importer/__init__.py b/glue/io/qt/directory_importer/__init__.py deleted file mode 100644 index ce7679906..000000000 --- a/glue/io/qt/directory_importer/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.io.qt.directory_importer is deprecated, use glue_qt.io.directory_importer instead', GlueDeprecationWarning) -from glue_qt.io.directory_importer import * # noqa diff --git a/glue/io/qt/directory_importer/directory_importer.py b/glue/io/qt/directory_importer/directory_importer.py deleted file mode 100644 index 440576b4f..000000000 --- a/glue/io/qt/directory_importer/directory_importer.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.io.qt.directory_importer.directory_importer is deprecated, use glue_qt.io.directory_importer.directory_importer instead', GlueDeprecationWarning) -from glue_qt.io.directory_importer.directory_importer import * # noqa diff --git a/glue/io/qt/subset_mask.py b/glue/io/qt/subset_mask.py deleted file mode 100644 index 98327dfda..000000000 --- a/glue/io/qt/subset_mask.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.io.qt.subset_mask is deprecated, use glue_qt.io.subset_mask instead', GlueDeprecationWarning) -from glue_qt.io.subset_mask import * # noqa diff --git a/glue/plugins/dendro_viewer/qt/__init__.py b/glue/plugins/dendro_viewer/qt/__init__.py deleted file mode 100644 index ba953ec70..000000000 --- a/glue/plugins/dendro_viewer/qt/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.plugins.dendro_viewer.qt is deprecated, use glue_qt.plugins.dendro_viewer instead', GlueDeprecationWarning) -from glue_qt.plugins.dendro_viewer import * # noqa diff --git a/glue/plugins/dendro_viewer/qt/data_viewer.py b/glue/plugins/dendro_viewer/qt/data_viewer.py deleted file mode 100644 index 52478e644..000000000 --- a/glue/plugins/dendro_viewer/qt/data_viewer.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.plugins.dendro_viewer.qt.data_viewer is deprecated, use glue_qt.plugins.dendro_viewer.data_viewer instead', GlueDeprecationWarning) -from glue_qt.plugins.dendro_viewer.data_viewer import * # noqa diff --git a/glue/plugins/dendro_viewer/qt/layer_style_editor.py b/glue/plugins/dendro_viewer/qt/layer_style_editor.py deleted file mode 100644 index c72401393..000000000 --- a/glue/plugins/dendro_viewer/qt/layer_style_editor.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.plugins.dendro_viewer.qt.layer_style_editor is deprecated, use glue_qt.plugins.dendro_viewer.layer_style_editor instead', GlueDeprecationWarning) -from glue_qt.plugins.dendro_viewer.layer_style_editor import * # noqa diff --git a/glue/plugins/dendro_viewer/qt/options_widget.py b/glue/plugins/dendro_viewer/qt/options_widget.py deleted file mode 100644 index 1d76ee37a..000000000 --- a/glue/plugins/dendro_viewer/qt/options_widget.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.plugins.dendro_viewer.qt.options_widget is deprecated, use glue_qt.plugins.dendro_viewer.options_widget instead', GlueDeprecationWarning) -from glue_qt.plugins.dendro_viewer.options_widget import * # noqa diff --git a/glue/plugins/tools/pv_slicer/qt/__init__.py b/glue/plugins/tools/pv_slicer/qt/__init__.py deleted file mode 100644 index 031c55332..000000000 --- a/glue/plugins/tools/pv_slicer/qt/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.plugins.tools.pv_slicer.qt is deprecated, use glue_qt.plugins.tools.pv_slicer instead', GlueDeprecationWarning) -from glue_qt.plugins.tools.pv_slicer import * # noqa diff --git a/glue/plugins/tools/pv_slicer/qt/pv_slicer.py b/glue/plugins/tools/pv_slicer/qt/pv_slicer.py deleted file mode 100644 index 12c531e6c..000000000 --- a/glue/plugins/tools/pv_slicer/qt/pv_slicer.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.plugins.tools.pv_slicer.qt.pv_slicer is deprecated, use glue_qt.plugins.tools.pv_slicer.pv_slicer instead', GlueDeprecationWarning) -from glue_qt.plugins.tools.pv_slicer.pv_slicer import * # noqa diff --git a/glue/qglue.py b/glue/qglue.py deleted file mode 100644 index 66dc0e175..000000000 --- a/glue/qglue.py +++ /dev/null @@ -1,18 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning - -warnings.warn('Importing from glue.qglue is deprecated, use glue_qt.qglue instead', GlueDeprecationWarning) - -from glue_qt.qglue import * # noqa - - -def parse_data(*args, **kwargs): - warnings.warn('glue.qglue.parse_data is deprecated, use glue.core.parsers.parse_data instead', GlueDeprecationWarning) - from glue.core.parsers import parse_data - return parse_data(*args, **kwargs) - - -def parse_links(*args, **kwargs): - warnings.warn('glue.qglue.parse_links is deprecated, use glue.core.parsers.parse_links instead', GlueDeprecationWarning) - from glue.core.parsers import parse_links - return parse_links(*args, **kwargs) diff --git a/glue/utils/qt/__init__.py b/glue/utils/qt/__init__.py deleted file mode 100644 index 95cc710cd..000000000 --- a/glue/utils/qt/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.utils.qt is deprecated, use glue_qt.utils instead', GlueDeprecationWarning) -from glue_qt.utils import * # noqa diff --git a/glue/utils/qt/app.py b/glue/utils/qt/app.py deleted file mode 100644 index 1ade6b52a..000000000 --- a/glue/utils/qt/app.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.utils.qt.app is deprecated, use glue_qt.utils.app instead', GlueDeprecationWarning) -from glue_qt.utils.app import * # noqa diff --git a/glue/utils/qt/autocomplete_widget.py b/glue/utils/qt/autocomplete_widget.py deleted file mode 100644 index 07c699e3a..000000000 --- a/glue/utils/qt/autocomplete_widget.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.utils.qt.autocomplete_widget is deprecated, use glue_qt.utils.autocomplete_widget instead', GlueDeprecationWarning) -from glue_qt.utils.autocomplete_widget import * # noqa diff --git a/glue/utils/qt/colors.py b/glue/utils/qt/colors.py deleted file mode 100644 index acd5d2aad..000000000 --- a/glue/utils/qt/colors.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.utils.qt.colors is deprecated, use glue_qt.utils.colors instead', GlueDeprecationWarning) -from glue_qt.utils.colors import * # noqa diff --git a/glue/utils/qt/decorators.py b/glue/utils/qt/decorators.py deleted file mode 100644 index 36f64a5d1..000000000 --- a/glue/utils/qt/decorators.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.utils.qt.decorators is deprecated, use glue_qt.utils.decorators instead', GlueDeprecationWarning) -from glue_qt.utils.decorators import * # noqa diff --git a/glue/utils/qt/delegates.py b/glue/utils/qt/delegates.py deleted file mode 100644 index 8906740dc..000000000 --- a/glue/utils/qt/delegates.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.utils.qt.delegates is deprecated, use glue_qt.utils.delegates instead', GlueDeprecationWarning) -from glue_qt.utils.delegates import * # noqa diff --git a/glue/utils/qt/dialogs.py b/glue/utils/qt/dialogs.py deleted file mode 100644 index dcd1d13b9..000000000 --- a/glue/utils/qt/dialogs.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.utils.qt.dialogs is deprecated, use glue_qt.utils.dialogs instead', GlueDeprecationWarning) -from glue_qt.utils.dialogs import * # noqa diff --git a/glue/utils/qt/helpers.py b/glue/utils/qt/helpers.py deleted file mode 100644 index 07138b9d9..000000000 --- a/glue/utils/qt/helpers.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.utils.qt.helpers is deprecated, use glue_qt.utils.helpers instead', GlueDeprecationWarning) -from glue_qt.utils.helpers import * # noqa diff --git a/glue/utils/qt/mime.py b/glue/utils/qt/mime.py deleted file mode 100644 index 10a67dd2b..000000000 --- a/glue/utils/qt/mime.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.utils.qt.mime is deprecated, use glue_qt.utils.mime instead', GlueDeprecationWarning) -from glue_qt.utils.mime import * # noqa diff --git a/glue/utils/qt/mixins.py b/glue/utils/qt/mixins.py deleted file mode 100644 index 0037a89ae..000000000 --- a/glue/utils/qt/mixins.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.utils.qt.mixins is deprecated, use glue_qt.utils.mixins instead', GlueDeprecationWarning) -from glue_qt.utils.mixins import * # noqa diff --git a/glue/utils/qt/python_list_model.py b/glue/utils/qt/python_list_model.py deleted file mode 100644 index a3ad8699b..000000000 --- a/glue/utils/qt/python_list_model.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.utils.qt.python_list_model is deprecated, use glue_qt.utils.python_list_model instead', GlueDeprecationWarning) -from glue_qt.utils.python_list_model import * # noqa diff --git a/glue/utils/qt/threading.py b/glue/utils/qt/threading.py deleted file mode 100644 index 99e05300c..000000000 --- a/glue/utils/qt/threading.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.utils.qt.threading is deprecated, use glue_qt.utils.threading instead', GlueDeprecationWarning) -from glue_qt.utils.threading import * # noqa diff --git a/glue/utils/qt/widget_properties.py b/glue/utils/qt/widget_properties.py deleted file mode 100644 index 6bb8f6b32..000000000 --- a/glue/utils/qt/widget_properties.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.utils.qt.widget_properties is deprecated, use glue_qt.utils.widget_properties instead', GlueDeprecationWarning) -from glue_qt.utils.widget_properties import * # noqa diff --git a/glue/viewers/common/qt/__init__.py b/glue/viewers/common/qt/__init__.py deleted file mode 100644 index 63c3cdd0c..000000000 --- a/glue/viewers/common/qt/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.common.qt is deprecated, use glue_qt.viewers.common instead', GlueDeprecationWarning) -from glue_qt.viewers.common import * # noqa diff --git a/glue/viewers/common/qt/base_widget.py b/glue/viewers/common/qt/base_widget.py deleted file mode 100644 index a863189d7..000000000 --- a/glue/viewers/common/qt/base_widget.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.common.qt.base_widget is deprecated, use glue_qt.viewers.common.base_widget instead', GlueDeprecationWarning) -from glue_qt.viewers.common.base_widget import * # noqa diff --git a/glue/viewers/common/qt/data_slice_widget.py b/glue/viewers/common/qt/data_slice_widget.py deleted file mode 100644 index edad718b0..000000000 --- a/glue/viewers/common/qt/data_slice_widget.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.common.qt.data_slice_widget is deprecated, use glue_qt.viewers.common.data_slice_widget instead', GlueDeprecationWarning) -from glue_qt.viewers.common.data_slice_widget import * # noqa diff --git a/glue/viewers/common/qt/data_viewer.py b/glue/viewers/common/qt/data_viewer.py deleted file mode 100644 index 8e9076d65..000000000 --- a/glue/viewers/common/qt/data_viewer.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.common.qt.data_viewer is deprecated, use glue_qt.viewers.common.data_viewer instead', GlueDeprecationWarning) -from glue_qt.viewers.common.data_viewer import * # noqa diff --git a/glue/viewers/common/qt/data_viewer_with_state.py b/glue/viewers/common/qt/data_viewer_with_state.py deleted file mode 100644 index 1e56224d8..000000000 --- a/glue/viewers/common/qt/data_viewer_with_state.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.common.qt.data_viewer_with_state is deprecated, use glue_qt.viewers.common.data_viewer_with_state instead', GlueDeprecationWarning) -from glue_qt.viewers.common.data_viewer_with_state import * # noqa diff --git a/glue/viewers/common/qt/tool.py b/glue/viewers/common/qt/tool.py deleted file mode 100644 index 00e222683..000000000 --- a/glue/viewers/common/qt/tool.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.common.qt.tool is deprecated, use glue_qt.viewers.common.tool instead', GlueDeprecationWarning) -from glue_qt.viewers.common.tool import * # noqa diff --git a/glue/viewers/common/qt/toolbar.py b/glue/viewers/common/qt/toolbar.py deleted file mode 100644 index a8024f693..000000000 --- a/glue/viewers/common/qt/toolbar.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.common.qt.toolbar is deprecated, use glue_qt.viewers.common.toolbar instead', GlueDeprecationWarning) -from glue_qt.viewers.common.toolbar import * # noqa diff --git a/glue/viewers/common/qt/tools.py b/glue/viewers/common/qt/tools.py deleted file mode 100644 index fcfdba44e..000000000 --- a/glue/viewers/common/qt/tools.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.common.qt.tools is deprecated, use glue_qt.viewers.common.tools instead', GlueDeprecationWarning) -from glue_qt.viewers.common.tools import * # noqa diff --git a/glue/viewers/custom/qt/__init__.py b/glue/viewers/custom/qt/__init__.py deleted file mode 100644 index b3bf0b8ed..000000000 --- a/glue/viewers/custom/qt/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.custom.qt is deprecated, use glue_qt.viewers.custom instead', GlueDeprecationWarning) -from glue_qt.viewers.custom import * # noqa diff --git a/glue/viewers/custom/qt/custom_viewer.py b/glue/viewers/custom/qt/custom_viewer.py deleted file mode 100644 index 07313bde2..000000000 --- a/glue/viewers/custom/qt/custom_viewer.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.custom.qt.custom_viewer is deprecated, use glue_qt.viewers.custom.custom_viewer instead', GlueDeprecationWarning) -from glue_qt.viewers.custom.custom_viewer import * # noqa diff --git a/glue/viewers/custom/qt/elements.py b/glue/viewers/custom/qt/elements.py deleted file mode 100644 index 1c2d688c9..000000000 --- a/glue/viewers/custom/qt/elements.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.custom.qt.elements is deprecated, use glue_qt.viewers.custom.elements instead', GlueDeprecationWarning) -from glue_qt.viewers.custom.elements import * # noqa diff --git a/glue/viewers/histogram/qt/__init__.py b/glue/viewers/histogram/qt/__init__.py deleted file mode 100644 index 96226f2e9..000000000 --- a/glue/viewers/histogram/qt/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.histogram.qt is deprecated, use glue_qt.viewers.histogram instead', GlueDeprecationWarning) -from glue_qt.viewers.histogram import * # noqa diff --git a/glue/viewers/histogram/qt/data_viewer.py b/glue/viewers/histogram/qt/data_viewer.py deleted file mode 100644 index c294f9bfb..000000000 --- a/glue/viewers/histogram/qt/data_viewer.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.histogram.qt.data_viewer is deprecated, use glue_qt.viewers.histogram.data_viewer instead', GlueDeprecationWarning) -from glue_qt.viewers.histogram.data_viewer import * # noqa diff --git a/glue/viewers/histogram/qt/layer_artist.py b/glue/viewers/histogram/qt/layer_artist.py deleted file mode 100644 index 693af623e..000000000 --- a/glue/viewers/histogram/qt/layer_artist.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.histogram.qt.layer_artist is deprecated, use glue_qt.viewers.histogram.layer_artist instead', GlueDeprecationWarning) -from glue_qt.viewers.histogram.layer_artist import * # noqa diff --git a/glue/viewers/histogram/qt/layer_style_editor.py b/glue/viewers/histogram/qt/layer_style_editor.py deleted file mode 100644 index 96f7f1f29..000000000 --- a/glue/viewers/histogram/qt/layer_style_editor.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.histogram.qt.layer_style_editor is deprecated, use glue_qt.viewers.histogram.layer_style_editor instead', GlueDeprecationWarning) -from glue_qt.viewers.histogram.layer_style_editor import * # noqa diff --git a/glue/viewers/histogram/qt/options_widget.py b/glue/viewers/histogram/qt/options_widget.py deleted file mode 100644 index 3a7c880eb..000000000 --- a/glue/viewers/histogram/qt/options_widget.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.histogram.qt.options_widget is deprecated, use glue_qt.viewers.histogram.options_widget instead', GlueDeprecationWarning) -from glue_qt.viewers.histogram.options_widget import * # noqa diff --git a/glue/viewers/image/qt/__init__.py b/glue/viewers/image/qt/__init__.py deleted file mode 100644 index 5444f7485..000000000 --- a/glue/viewers/image/qt/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.image.qt is deprecated, use glue_qt.viewers.image instead', GlueDeprecationWarning) -from glue_qt.viewers.image import * # noqa diff --git a/glue/viewers/image/qt/contrast_mouse_mode.py b/glue/viewers/image/qt/contrast_mouse_mode.py deleted file mode 100644 index 37d452705..000000000 --- a/glue/viewers/image/qt/contrast_mouse_mode.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.image.qt.contrast_mouse_mode is deprecated, use glue_qt.viewers.image.contrast_mouse_mode instead', GlueDeprecationWarning) -from glue_qt.viewers.image.contrast_mouse_mode import * # noqa diff --git a/glue/viewers/image/qt/data_viewer.py b/glue/viewers/image/qt/data_viewer.py deleted file mode 100644 index 7499d72a3..000000000 --- a/glue/viewers/image/qt/data_viewer.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.image.qt.data_viewer is deprecated, use glue_qt.viewers.image.data_viewer instead', GlueDeprecationWarning) -from glue_qt.viewers.image.data_viewer import * # noqa diff --git a/glue/viewers/image/qt/layer_style_editor.py b/glue/viewers/image/qt/layer_style_editor.py deleted file mode 100644 index 253591c36..000000000 --- a/glue/viewers/image/qt/layer_style_editor.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.image.qt.layer_style_editor is deprecated, use glue_qt.viewers.image.layer_style_editor instead', GlueDeprecationWarning) -from glue_qt.viewers.image.layer_style_editor import * # noqa diff --git a/glue/viewers/image/qt/layer_style_editor_subset.py b/glue/viewers/image/qt/layer_style_editor_subset.py deleted file mode 100644 index 8713eb546..000000000 --- a/glue/viewers/image/qt/layer_style_editor_subset.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.image.qt.layer_style_editor_subset is deprecated, use glue_qt.viewers.image.layer_style_editor_subset instead', GlueDeprecationWarning) -from glue_qt.viewers.image.layer_style_editor_subset import * # noqa diff --git a/glue/viewers/image/qt/mouse_mode.py b/glue/viewers/image/qt/mouse_mode.py deleted file mode 100644 index bf4789933..000000000 --- a/glue/viewers/image/qt/mouse_mode.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.image.qt.mouse_mode is deprecated, use glue_qt.viewers.image.mouse_mode instead', GlueDeprecationWarning) -from glue_qt.viewers.image.mouse_mode import * # noqa diff --git a/glue/viewers/image/qt/options_widget.py b/glue/viewers/image/qt/options_widget.py deleted file mode 100644 index b157c97de..000000000 --- a/glue/viewers/image/qt/options_widget.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.image.qt.options_widget is deprecated, use glue_qt.viewers.image.options_widget instead', GlueDeprecationWarning) -from glue_qt.viewers.image.options_widget import * # noqa diff --git a/glue/viewers/image/qt/pixel_selection_mode.py b/glue/viewers/image/qt/pixel_selection_mode.py deleted file mode 100644 index 4bad22fc4..000000000 --- a/glue/viewers/image/qt/pixel_selection_mode.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.image.qt.pixel_selection_mode is deprecated, use glue_qt.viewers.image.pixel_selection_mode instead', GlueDeprecationWarning) -from glue_qt.viewers.image.pixel_selection_mode import * # noqa diff --git a/glue/viewers/image/qt/profile_viewer_tool.py b/glue/viewers/image/qt/profile_viewer_tool.py deleted file mode 100644 index c89021d39..000000000 --- a/glue/viewers/image/qt/profile_viewer_tool.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.image.qt.profile_viewer_tool is deprecated, use glue_qt.viewers.image.profile_viewer_tool instead', GlueDeprecationWarning) -from glue_qt.viewers.image.profile_viewer_tool import * # noqa diff --git a/glue/viewers/image/qt/slice_widget.py b/glue/viewers/image/qt/slice_widget.py deleted file mode 100644 index 692f4ea6c..000000000 --- a/glue/viewers/image/qt/slice_widget.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.image.qt.slice_widget is deprecated, use glue_qt.viewers.image.slice_widget instead', GlueDeprecationWarning) -from glue_qt.viewers.image.slice_widget import * # noqa diff --git a/glue/viewers/image/qt/standalone_image_viewer.py b/glue/viewers/image/qt/standalone_image_viewer.py deleted file mode 100644 index 437466bba..000000000 --- a/glue/viewers/image/qt/standalone_image_viewer.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.image.qt.standalone_image_viewer is deprecated, use glue_qt.viewers.image.standalone_image_viewer instead', GlueDeprecationWarning) -from glue_qt.viewers.image.standalone_image_viewer import * # noqa diff --git a/glue/viewers/matplotlib/qt/__init__.py b/glue/viewers/matplotlib/qt/__init__.py deleted file mode 100644 index 2d725e620..000000000 --- a/glue/viewers/matplotlib/qt/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.matplotlib.qt is deprecated, use glue_qt.viewers.matplotlib instead', GlueDeprecationWarning) -from glue_qt.viewers.matplotlib import * # noqa diff --git a/glue/viewers/matplotlib/qt/axes_editor.py b/glue/viewers/matplotlib/qt/axes_editor.py deleted file mode 100644 index dbcf092e9..000000000 --- a/glue/viewers/matplotlib/qt/axes_editor.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.matplotlib.qt.axes_editor is deprecated, use glue_qt.viewers.matplotlib.axes_editor instead', GlueDeprecationWarning) -from glue_qt.viewers.matplotlib.axes_editor import * # noqa diff --git a/glue/viewers/matplotlib/qt/compute_worker.py b/glue/viewers/matplotlib/qt/compute_worker.py deleted file mode 100644 index 34e2f794b..000000000 --- a/glue/viewers/matplotlib/qt/compute_worker.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.matplotlib.qt.compute_worker is deprecated, use glue_qt.viewers.matplotlib.compute_worker instead', GlueDeprecationWarning) -from glue_qt.viewers.matplotlib.compute_worker import * # noqa diff --git a/glue/viewers/matplotlib/qt/data_viewer.py b/glue/viewers/matplotlib/qt/data_viewer.py deleted file mode 100644 index aa334f43c..000000000 --- a/glue/viewers/matplotlib/qt/data_viewer.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.matplotlib.qt.data_viewer is deprecated, use glue_qt.viewers.matplotlib.data_viewer instead', GlueDeprecationWarning) -from glue_qt.viewers.matplotlib.data_viewer import * # noqa diff --git a/glue/viewers/matplotlib/qt/legend_editor.py b/glue/viewers/matplotlib/qt/legend_editor.py deleted file mode 100644 index 762f23046..000000000 --- a/glue/viewers/matplotlib/qt/legend_editor.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.matplotlib.qt.legend_editor is deprecated, use glue_qt.viewers.matplotlib.legend_editor instead', GlueDeprecationWarning) -from glue_qt.viewers.matplotlib.legend_editor import * # noqa diff --git a/glue/viewers/matplotlib/qt/toolbar.py b/glue/viewers/matplotlib/qt/toolbar.py deleted file mode 100644 index c2ec8c2be..000000000 --- a/glue/viewers/matplotlib/qt/toolbar.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.matplotlib.qt.toolbar is deprecated, use glue_qt.viewers.matplotlib.toolbar instead', GlueDeprecationWarning) -from glue_qt.viewers.matplotlib.toolbar import * # noqa diff --git a/glue/viewers/matplotlib/qt/toolbar_mode.py b/glue/viewers/matplotlib/qt/toolbar_mode.py deleted file mode 100644 index 69af6a89e..000000000 --- a/glue/viewers/matplotlib/qt/toolbar_mode.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.matplotlib.qt.toolbar_mode is deprecated, use glue_qt.viewers.matplotlib.toolbar_mode instead', GlueDeprecationWarning) -from glue_qt.viewers.matplotlib.toolbar_mode import * # noqa diff --git a/glue/viewers/matplotlib/qt/widget.py b/glue/viewers/matplotlib/qt/widget.py deleted file mode 100644 index d9b1a89ac..000000000 --- a/glue/viewers/matplotlib/qt/widget.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.matplotlib.qt.widget is deprecated, use glue_qt.viewers.matplotlib.widget instead', GlueDeprecationWarning) -from glue_qt.viewers.matplotlib.widget import * # noqa diff --git a/glue/viewers/profile/qt/__init__.py b/glue/viewers/profile/qt/__init__.py deleted file mode 100644 index 2b9e5fa54..000000000 --- a/glue/viewers/profile/qt/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.profile.qt is deprecated, use glue_qt.viewers.profile instead', GlueDeprecationWarning) -from glue_qt.viewers.profile import * # noqa diff --git a/glue/viewers/profile/qt/data_viewer.py b/glue/viewers/profile/qt/data_viewer.py deleted file mode 100644 index 77ed871f7..000000000 --- a/glue/viewers/profile/qt/data_viewer.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.profile.qt.data_viewer is deprecated, use glue_qt.viewers.profile.data_viewer instead', GlueDeprecationWarning) -from glue_qt.viewers.profile.data_viewer import * # noqa diff --git a/glue/viewers/profile/qt/layer_artist.py b/glue/viewers/profile/qt/layer_artist.py deleted file mode 100644 index f584c22fd..000000000 --- a/glue/viewers/profile/qt/layer_artist.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.profile.qt.layer_artist is deprecated, use glue_qt.viewers.profile.layer_artist instead', GlueDeprecationWarning) -from glue_qt.viewers.profile.layer_artist import * # noqa diff --git a/glue/viewers/profile/qt/layer_style_editor.py b/glue/viewers/profile/qt/layer_style_editor.py deleted file mode 100644 index 8ff0884bb..000000000 --- a/glue/viewers/profile/qt/layer_style_editor.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.profile.qt.layer_style_editor is deprecated, use glue_qt.viewers.profile.layer_style_editor instead', GlueDeprecationWarning) -from glue_qt.viewers.profile.layer_style_editor import * # noqa diff --git a/glue/viewers/profile/qt/mouse_mode.py b/glue/viewers/profile/qt/mouse_mode.py deleted file mode 100644 index 7c14a0143..000000000 --- a/glue/viewers/profile/qt/mouse_mode.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.profile.qt.mouse_mode is deprecated, use glue_qt.viewers.profile.mouse_mode instead', GlueDeprecationWarning) -from glue_qt.viewers.profile.mouse_mode import * # noqa diff --git a/glue/viewers/profile/qt/options_widget.py b/glue/viewers/profile/qt/options_widget.py deleted file mode 100644 index 93ff9ed25..000000000 --- a/glue/viewers/profile/qt/options_widget.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.profile.qt.options_widget is deprecated, use glue_qt.viewers.profile.options_widget instead', GlueDeprecationWarning) -from glue_qt.viewers.profile.options_widget import * # noqa diff --git a/glue/viewers/profile/qt/profile_tools.py b/glue/viewers/profile/qt/profile_tools.py deleted file mode 100644 index 41eb0cf45..000000000 --- a/glue/viewers/profile/qt/profile_tools.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.profile.qt.profile_tools is deprecated, use glue_qt.viewers.profile.profile_tools instead', GlueDeprecationWarning) -from glue_qt.viewers.profile.profile_tools import * # noqa diff --git a/glue/viewers/scatter/qt/__init__.py b/glue/viewers/scatter/qt/__init__.py deleted file mode 100644 index 5c9d59659..000000000 --- a/glue/viewers/scatter/qt/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.scatter.qt is deprecated, use glue_qt.viewers.scatter instead', GlueDeprecationWarning) -from glue_qt.viewers.scatter import * # noqa diff --git a/glue/viewers/scatter/qt/data_viewer.py b/glue/viewers/scatter/qt/data_viewer.py deleted file mode 100644 index b9f1f1865..000000000 --- a/glue/viewers/scatter/qt/data_viewer.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.scatter.qt.data_viewer is deprecated, use glue_qt.viewers.scatter.data_viewer instead', GlueDeprecationWarning) -from glue_qt.viewers.scatter.data_viewer import * # noqa diff --git a/glue/viewers/scatter/qt/layer_style_editor.py b/glue/viewers/scatter/qt/layer_style_editor.py deleted file mode 100644 index 39c7a490c..000000000 --- a/glue/viewers/scatter/qt/layer_style_editor.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.scatter.qt.layer_style_editor is deprecated, use glue_qt.viewers.scatter.layer_style_editor instead', GlueDeprecationWarning) -from glue_qt.viewers.scatter.layer_style_editor import * # noqa diff --git a/glue/viewers/scatter/qt/options_widget.py b/glue/viewers/scatter/qt/options_widget.py deleted file mode 100644 index fe1e5fc51..000000000 --- a/glue/viewers/scatter/qt/options_widget.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.scatter.qt.options_widget is deprecated, use glue_qt.viewers.scatter.options_widget instead', GlueDeprecationWarning) -from glue_qt.viewers.scatter.options_widget import * # noqa diff --git a/glue/viewers/table/qt/__init__.py b/glue/viewers/table/qt/__init__.py deleted file mode 100644 index 6220498c9..000000000 --- a/glue/viewers/table/qt/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.table.qt is deprecated, use glue_qt.viewers.table instead', GlueDeprecationWarning) -from glue_qt.viewers.table import * # noqa diff --git a/glue/viewers/table/qt/data_viewer.py b/glue/viewers/table/qt/data_viewer.py deleted file mode 100644 index e54734d0b..000000000 --- a/glue/viewers/table/qt/data_viewer.py +++ /dev/null @@ -1,4 +0,0 @@ -import warnings -from glue.utils.error import GlueDeprecationWarning -warnings.warn('Importing from glue.viewers.table.qt.data_viewer is deprecated, use glue_qt.viewers.table.data_viewer instead', GlueDeprecationWarning) -from glue_qt.viewers.table.data_viewer import * # noqa diff --git a/setup.cfg b/setup.cfg index 319a8cfbc..44e4f5bed 100644 --- a/setup.cfg +++ b/setup.cfg @@ -38,11 +38,6 @@ install_requires = pvextractor>=0.2 importlib_resources>=1.3; python_version<'3.9' importlib_metadata>=3.6; python_version<'3.10' - # For now, we include a dependency on glue-qt so that imports of the - # Qt-related functionality continue to work albeit with a deprecation - # warning. Once the deprecation phase is over, we can remove this - # dependency as well as all the compatibility imports. - glue-qt>=0.1.0 shapely>=2.0 [options.entry_points]