Merge branch 'main' of github.com:glue-viz/glue-qt into py_ver_update

Author: CyclingNinja

.pre-commit-config.yaml

@@ -54,7 +54,7 @@ repos:
         # Forbid files which have a UTF-8 Unicode replacement character.
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.11.12"
+    rev: "v0.12.7"
     hooks:
       - id: ruff
         args: ["--fix", "--show-fixes"]

glue_qt/viewers/image/data_viewer.py

@@ -12,7 +12,12 @@
 # Import the mouse mode to make sure it gets registered
 from glue_qt.viewers.image.contrast_mouse_mode import ContrastBiasMode  # noqa
 from glue_qt.viewers.image.profile_viewer_tool import ProfileViewerTool  # noqa
-from glue_qt.viewers.image.pixel_selection_mode import PixelSelectionTool  # noqa
+try:
+    from glue.viewers.image.pixel_selection_mode import PixelSelectionTool  # noqa
+except ModuleNotFoundError:
+    from glue_qt.viewers.image.pixel_selection_mode import PixelSelectionTool  #noqa
+
+
 
 from glue.viewers.image.viewer import MatplotlibImageMixin
 

glue_qt/viewers/matplotlib/tests/test_data_viewer.py

@@ -3,6 +3,7 @@
 import sys
 
 import pytest
+import numpy as np
 from numpy.testing import assert_allclose
 
 try:
@@ -18,7 +19,7 @@
 from glue.core.roi import XRangeROI
 from glue_qt.utils import process_events
 from glue.tests.helpers import requires_matplotlib_ge_22
-from glue_qt.tests.helpers import requires_pyqt
+from glue_qt.tests.helpers import requires_pyqt, PYQT5_INSTALLED
 
 
 class MatplotlibDrawCounter(object):
@@ -593,8 +594,10 @@ def limits(viewer):
         self.viewer.viewer_size = (400, 400)
         self.viewer.figure.canvas.draw()
         process_events(wait=0.1)
-        with pytest.raises(AssertionError):
-            assert_allclose(limits(self.viewer), initial_limits)
+
+        # Broken in Linux CI with PyQT5
+        if not (PYQT5_INSTALLED and sys.platform == 'linux'):
+            assert not np.allclose(limits(self.viewer), initial_limits, rtol=1e-7, atol=0)
 
         # Now change the viewer size a number of times and make sure if we
         # return to the original size, the limits match the initial ones.

setup.cfg

@@ -79,10 +79,10 @@ allowlist_externals =
     sh
 commands =
     test: pip freeze
-    test-!skipexitcode: pytest --pyargs glue_qt --cov glue_qt --cov-config={toxinidir}/setup.cfg {posargs}
+    test-!skipexitcode: pytest --pyargs glue_qt --cov glue_qt --cov-config={toxinidir}/pyproject.toml {posargs}
     # The skipexitcode mode consists of ignoring the exit code of the pytest
     # command and just checking whether any errors or failures were present.
-    test-skipexitcode: sh -c 'pytest --pyargs glue_qt --cov glue_qt --cov-config={toxinidir}/setup.cfg --junit-xml={toxinidir}/{envname}.xml {posargs} || true'
+    test-skipexitcode: sh -c 'pytest --pyargs glue_qt --cov glue_qt --cov-config={toxinidir}/pyproject.toml --junit-xml={toxinidir}/{envname}.xml {posargs} || true'
     test-skipexitcode: python {toxinidir}/.github/workflows/check_failures.py {toxinidir}/{envname}.xml
     docs: sphinx-build -W -n -b html -d _build/doctrees   . _build/html