Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions .github/workflows/ci_workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,17 @@ jobs:
# Standard tests
# Linux builds - test on all supported PyQt5/6 and PySide2/6 versions,
# and include all dependencies in some builds
- linux: py38-test-pyqt514-all
- linux: py39-test-pyqt515
- linux: py310-test-pyqt63-all
- linux: py311-test-pyqt64
- linux: py312-test-pyqt65
- linux: py312-test-pyqt68
- linux: py313-test-pyqt67
- linux: py311-test-pyqt66-all
- linux: py311-test-pyqt514
- linux: py311-test-pyqt515-lts-all
- linux: py314-test-pyqt68-dev
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move to # Test against latest developer versions... below


# Documentation build
- linux: py38-docs-pyqt514
- linux: py313-docs-pyqt514
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will probably run with py311 at most, but I'm not sure why we absolutely need docs built with PyQt5, and if they couldn't be 5.15 at least. Check with @astrofrog

coverage: false
- macos: py311-docs-pyqt64
coverage: false
Expand All @@ -59,17 +57,16 @@ jobs:
- enchant

# Test a few configurations on macOS 13 (Intel, default for py<310) and 14 (Arm)
- macos: py38-test-pyqt514-all
- macos: py310-test-pyqt514-all
Copy link
Contributor

@dhomeier dhomeier Aug 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- macos: py310-test-pyqt514-all
- macos: py310-test-pyqt515-all

5.14 should still be available with macos-13 (there are wheels for x86_64), but since those runners are going to be retired anytime from 2-12 weeks from now, no point in switching.
5.15 wheels would seem to work for all supported Pythons on arm64.

- macos: py311-test-pyqt65
- macos: py312-test-pyqt66
runs-on: macos-13
- macos: py313-test-pyqt68

# Test some configurations on Windows
- windows: py38-test-pyqt514
- windows: py310-test-pyqt63
- windows: py311-test-pyqt65
- windows: py312-test-pyqt67
- windows: py313-test-pyqt67

# Test against latest developer versions of some packages
- linux: py311-test-pyqt64-dev
Expand All @@ -96,8 +93,6 @@ jobs:
envs: |

# Non-deterministic QThread exceptions
- linux: py38-test-pyside514-skipexitcode
- linux: py39-test-pyside515-skipexitcode
- linux: py310-test-pyside63-skipexitcode

# PySide6 6.4 failures due to https://github.com/spyder-ide/qtpy/issues/373
Expand Down
5 changes: 1 addition & 4 deletions glue_qt/viewers/image/data_viewer.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
# 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
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.pixel_selection_mode import PixelSelectionTool # noqa



Expand Down
65 changes: 0 additions & 65 deletions glue_qt/viewers/image/pixel_selection_mode.py

This file was deleted.

7 changes: 2 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@ classifiers = [
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
"Topic :: Scientific/Engineering :: Visualization",
"License :: OSI Approved :: BSD License",
]
Expand All @@ -21,7 +20,7 @@ requires-python = ">=3.8"
dynamic = [ "version",]

dependencies = [
"glue-core>=1.15.0",
"glue-core>=1.23.0",
"numpy>=1.17",
"matplotlib>=3.2",
"scipy>=1.1",
Expand All @@ -33,8 +32,6 @@ dependencies = [
"ipykernel>=4.0,!=5.0.0,!=5.1.0",
"qtconsole>=4.3,!=5.4.2",
"pvextractor>=0.2",
"importlib_resources>=1.3; python_version<'3.9'",
"importlib_metadata>=3.6; python_version<'3.10'",
]

[[project.authors]]
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
envlist =
py{38,39,310,311,312,313}-{codestyle,test,docs}-{pyqt514,pyqt515,pyside514,pyside515,pyqt63,pyqt64,pyqt65,pyqt66,pyqt67,pyqt68,pyside66,pyside67,pyside68}-all-{dev,legacy}
py{310,311,312,313,314}-{codestyle,test,docs}-{pyqt514,pyqt515,pyside514,pyside515,pyqt63,pyqt64,pyqt65,pyqt66,pyqt67,pyqt68,pyside66,pyside67,pyside68}-all-{dev,legacy}
requires = pip >= 18.0
setuptools >= 30.3.0

Expand Down
Loading