From b803114ecda5e6776c8e6c8ceef4147149696d58 Mon Sep 17 00:00:00 2001 From: Carifio24 Date: Fri, 11 Aug 2023 15:19:49 -0400 Subject: [PATCH 1/6] Update imports to use glue_qt wherever necessary. --- glue_wwt/viewer/image_style_editor.py | 2 +- glue_wwt/viewer/options_widget.py | 2 +- glue_wwt/viewer/qt_data_viewer.py | 2 +- glue_wwt/viewer/table_style_editor.py | 2 +- glue_wwt/viewer/tests/test_wwt_widget.py | 2 +- glue_wwt/viewer/tools.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/glue_wwt/viewer/image_style_editor.py b/glue_wwt/viewer/image_style_editor.py index bc622d63..e20c66f9 100644 --- a/glue_wwt/viewer/image_style_editor.py +++ b/glue_wwt/viewer/image_style_editor.py @@ -5,7 +5,7 @@ from qtpy import QtWidgets from echo.qt import autoconnect_callbacks_to_qt -from glue.utils.qt import load_ui +from glue_qt.utils import load_ui class WWTImageStyleEditor(QtWidgets.QWidget): diff --git a/glue_wwt/viewer/options_widget.py b/glue_wwt/viewer/options_widget.py index 9efd0fad..1ba1758e 100644 --- a/glue_wwt/viewer/options_widget.py +++ b/glue_wwt/viewer/options_widget.py @@ -3,7 +3,7 @@ import os from qtpy import QtWidgets -from glue.utils.qt import load_ui +from glue_qt.utils import load_ui from echo.qt import autoconnect_callbacks_to_qt from .viewer_state import MODES_BODIES diff --git a/glue_wwt/viewer/qt_data_viewer.py b/glue_wwt/viewer/qt_data_viewer.py index 76c4d451..fcb96578 100644 --- a/glue_wwt/viewer/qt_data_viewer.py +++ b/glue_wwt/viewer/qt_data_viewer.py @@ -1,6 +1,6 @@ from __future__ import absolute_import, division, print_function -from glue.viewers.common.qt.data_viewer import DataViewer +from glue_qt.viewers.common.data_viewer import DataViewer from .data_viewer import WWTDataViewerBase from .image_layer import WWTImageLayerArtist diff --git a/glue_wwt/viewer/table_style_editor.py b/glue_wwt/viewer/table_style_editor.py index 05df24d8..1ce3ae41 100644 --- a/glue_wwt/viewer/table_style_editor.py +++ b/glue_wwt/viewer/table_style_editor.py @@ -5,7 +5,7 @@ from qtpy import QtWidgets from echo.qt import autoconnect_callbacks_to_qt -from glue.utils.qt import load_ui, fix_tab_widget_fontsize +from glue_qt.utils import load_ui, fix_tab_widget_fontsize class WWTTableStyleEditor(QtWidgets.QWidget): diff --git a/glue_wwt/viewer/tests/test_wwt_widget.py b/glue_wwt/viewer/tests/test_wwt_widget.py index 77f3afcc..3464b9cc 100644 --- a/glue_wwt/viewer/tests/test_wwt_widget.py +++ b/glue_wwt/viewer/tests/test_wwt_widget.py @@ -9,9 +9,9 @@ from qtpy import compat -from glue.app.qt import GlueApplication from glue.core import Data, message from glue.core.tests.test_state import clone +from glue_qt.app import GlueApplication from ..qt_data_viewer import WWTQtViewer diff --git a/glue_wwt/viewer/tools.py b/glue_wwt/viewer/tools.py index c69b6584..8293e2f0 100644 --- a/glue_wwt/viewer/tools.py +++ b/glue_wwt/viewer/tools.py @@ -5,8 +5,8 @@ from qtpy import compat from glue.viewers.common.tool import Tool -from glue.utils.qt import get_qapp from glue.config import viewer_tool +from glue_qt.utils import get_qapp @viewer_tool From 92cd99318e44d3afc834f43a37855845972efeb4 Mon Sep 17 00:00:00 2001 From: Carifio24 Date: Fri, 11 Aug 2023 15:20:15 -0400 Subject: [PATCH 2/6] Update location for color box in UI files. --- glue_wwt/viewer/options_widget.ui | 2 +- glue_wwt/viewer/table_style_editor.ui | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/glue_wwt/viewer/options_widget.ui b/glue_wwt/viewer/options_widget.ui index 8ad9fe59..73480950 100644 --- a/glue_wwt/viewer/options_widget.ui +++ b/glue_wwt/viewer/options_widget.ui @@ -554,7 +554,7 @@ QColorBox QLabel -
glue.utils.qt.colors
+
glue_qt.utils.color
 diff --git a/glue_wwt/viewer/table_style_editor.ui b/glue_wwt/viewer/table_style_editor.ui index 4f063ee4..904825f3 100644 --- a/glue_wwt/viewer/table_style_editor.ui +++ b/glue_wwt/viewer/table_style_editor.ui @@ -416,12 +416,12 @@ QColorBox QLabel -
glue.utils.qt.colors
+
glue_qt.utils.colors
 QColormapCombo QComboBox -
glue.utils.qt.colors
+
glue_qt.utils.colors
 From 7d3b032d468d30aa9b8e9670201cf74a50b7b88d Mon Sep 17 00:00:00 2001 From: Carifio24 Date: Fri, 11 Aug 2023 15:20:43 -0400 Subject: [PATCH 3/6] Update locations in test glue session. --- glue_wwt/viewer/tests/data/wwt_simple.glu | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/glue_wwt/viewer/tests/data/wwt_simple.glu b/glue_wwt/viewer/tests/data/wwt_simple.glu index 58b352df..db29a328 100644 --- a/glue_wwt/viewer/tests/data/wwt_simple.glu +++ b/glue_wwt/viewer/tests/data/wwt_simple.glu @@ -241,24 +241,24 @@ "label": "World 0" }, "__main__": { - "_type": "glue.app.qt.application.GlueApplication", + "_type": "glue_qt.app.application.GlueApplication", "data": "DataCollection", "plugins": [ "glue_wwt", - "glue.plugins.dendro_viewer.qt", + "glue_qt.plugins.dendro_viewer", "glue_exp.tools.zoom_buttons", "mosviz", "glue.plugins.export_d3po", "glue_exp.importers.webcam", "glue_ginga", "glue_vispy_viewers.scatter", - "glue.viewers.histogram.qt", + "glue_qt.viewers.histogram", "glue.core.data_exporters", "glue_h5part", "glue.plugins.tools", "glue.plugins.tools.pv_slicer", - "glue.viewers.scatter.qt", - "glue.viewers.table.qt", + "glue_qt.viewers.scatter", + "glue_qt.viewers.table", "glue_dataverse", "glue_openspace", "glue.plugins.coordinate_helpers", @@ -269,8 +269,8 @@ "glue_plotly", "glue_exp.tools.contour_selection", "glue_noaodatalab", - "glue.viewers.image.qt", - "glue.viewers.profile.qt", + "glue_qt.viewers.image", + "glue_qt.viewers.profile", "glue_medical", "glue.io.formats.fits", "glue_vispy_viewers.volume" From f68d90c96f102f5873e76c202b5ec8a95a6140db Mon Sep 17 00:00:00 2001 From: Carifio24 Date: Tue, 15 Aug 2023 14:38:39 -0400 Subject: [PATCH 4/6] Fix typo and update install options. --- glue_wwt/viewer/options_widget.ui | 2 +- setup.cfg | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/glue_wwt/viewer/options_widget.ui b/glue_wwt/viewer/options_widget.ui index 73480950..3c9ea941 100644 --- a/glue_wwt/viewer/options_widget.ui +++ b/glue_wwt/viewer/options_widget.ui @@ -554,7 +554,7 @@ QColorBox QLabel -
glue_qt.utils.color
+
glue_qt.utils.colors
 diff --git a/setup.cfg b/setup.cfg index 7fff702c..fe16ee39 100644 --- a/setup.cfg +++ b/setup.cfg @@ -17,7 +17,6 @@ install_requires = numpy glue-core>=1.0 echo - qtpy astropy pywwt>=0.21.0 @@ -34,6 +33,10 @@ test = pytest pytest-cov mock + qtpy + glue-qt qt = + qtpy + glue-qt PyQt5;python_version>="3" PyQtWebEngine;python_version>="3" From f1363df219c57e3a35efd75c1c8933fc3d883207 Mon Sep 17 00:00:00 2001 From: Carifio24 Date: Tue, 15 Aug 2023 14:47:58 -0400 Subject: [PATCH 5/6] Bump minimum Python version to match glue-core. Replace 3.7 CI with 3.11. --- .github/workflows/ci_workflows.yml | 6 +++--- setup.cfg | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml index 598b168f..b8010557 100644 --- a/.github/workflows/ci_workflows.yml +++ b/.github/workflows/ci_workflows.yml @@ -20,20 +20,20 @@ jobs: - linux: codestyle # Standard tests - - linux: py37-test - linux: py38-test - linux: py39-test - linux: py310-test + - linux: py311-test - - macos: py37-test - macos: py38-test - macos: py39-test - macos: py310-test + - macos: py311-test - - windows: py37-test - windows: py38-test - windows: py39-test - windows: py310-test + - windows: py311-test publish: uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@v1 diff --git a/setup.cfg b/setup.cfg index fe16ee39..8f9ddf2a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -10,7 +10,7 @@ long_description = file: README.rst [options] zip_safe = False -python_requires = >=3.7 +python_requires = >=3.8 packages = find: setup_requires = setuptools_scm install_requires = From 2d1d707a50cc6b81f4b8050d04374d06d5566d03 Mon Sep 17 00:00:00 2001 From: Carifio24 Date: Wed, 16 Aug 2023 11:45:46 -0400 Subject: [PATCH 6/6] Simplify test dependencies. --- setup.cfg | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 8f9ddf2a..b3d82382 100644 --- a/setup.cfg +++ b/setup.cfg @@ -33,8 +33,6 @@ test = pytest pytest-cov mock - qtpy - glue-qt qt = qtpy glue-qt