diff --git a/glue_plotly/__init__.py b/glue_plotly/__init__.py index d8411c3..29ccfd1 100644 --- a/glue_plotly/__init__.py +++ b/glue_plotly/__init__.py @@ -69,8 +69,8 @@ def setup_qt(): } try: - from glue_vispy_viewers.scatter.scatter_viewer import VispyScatterViewer - from glue_vispy_viewers.volume.volume_viewer import VispyVolumeViewer + from glue_vispy_viewers.scatter.qt.scatter_viewer import VispyScatterViewer + from glue_vispy_viewers.volume.qt.volume_viewer import VispyVolumeViewer except ImportError: pass else: diff --git a/glue_plotly/html_exporters/qt/tests/test_scatter3d.py b/glue_plotly/html_exporters/qt/tests/test_scatter3d.py index 6ae1559..b0f512a 100644 --- a/glue_plotly/html_exporters/qt/tests/test_scatter3d.py +++ b/glue_plotly/html_exporters/qt/tests/test_scatter3d.py @@ -6,7 +6,7 @@ pytest.importorskip('glue_vispy_viewers') -from glue_vispy_viewers.scatter.scatter_viewer import VispyScatterViewer # noqa: E402 +from glue_vispy_viewers.scatter.qt.scatter_viewer import VispyScatterViewer # noqa: E402 from .test_base import TestQtExporter # noqa: E402 diff --git a/glue_plotly/html_exporters/qt/tests/test_volume.py b/glue_plotly/html_exporters/qt/tests/test_volume.py index bb2372b..cc38382 100644 --- a/glue_plotly/html_exporters/qt/tests/test_volume.py +++ b/glue_plotly/html_exporters/qt/tests/test_volume.py @@ -7,7 +7,7 @@ importorskip('glue_qt') importorskip('glue_vispy_viewers') -from glue_vispy_viewers.volume.volume_viewer import VispyVolumeViewer # noqa: E402 +from glue_vispy_viewers.volume.qt.volume_viewer import VispyVolumeViewer # noqa: E402 from numpy import arange, ones # noqa: E402 diff --git a/setup.cfg b/setup.cfg index fad8bb4..6922f17 100644 --- a/setup.cfg +++ b/setup.cfg @@ -23,11 +23,12 @@ test = pytest pytest-cov mock - glue-vispy-viewers qt = glue-qt PySide2;python_version=="2" PyQt5;python_version>="3" +3d = + glue-vispy-viewers>=1.2.1 jupyter = glue-jupyter ipyvuetify diff --git a/tox.ini b/tox.ini index cbbd189..37f9ed1 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,7 @@ passenv = changedir = test: .tmp/{envname} extras = - test: test,qt,jupyter + test: test,qt,3d,jupyter commands = glue116: pip install glue-core==1.16.* glue-jupyter<=0.19 matplotlib<3.9 glue117: pip install glue-core==1.17.* glue-jupyter<=0.20.1