diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml index 6958b385..b1a6f6e8 100644 --- a/.github/workflows/ci_workflows.yml +++ b/.github/workflows/ci_workflows.yml @@ -45,6 +45,7 @@ jobs: - linux: py310-test-pyqt63-all - linux: py311-test-pyqt64 - linux: py312-test-pyqt65 + - linux: py313-test-pyqt67 - linux: py311-test-pyqt66-all - linux: py311-test-pyqt514 - linux: py311-test-pyqt515-lts-all @@ -57,20 +58,21 @@ jobs: # Test a few configurations on macOS 12 (Intel) and 14 (ARM) - macos: py38-test-pyqt514-all - - macos: py311-test-pyqt66 + - macos: py311-test-pyqt65 - macos: py312-test-pyqt67 + - macos: py313-test-pyqt66 # Test some configurations on Windows - - windows: py38-test-pyqt514 + - windows: py39-test-pyqt514 - windows: py310-test-pyqt63 - windows: py311-test-pyqt65 - windows: py312-test-pyqt66 # Test against latest developer versions of some packages - - linux: py310-test-pyqt515-dev-all - linux: py311-test-pyqt64-dev - - linux: py312-test-pyqt515-dev - - linux: py312-test-pyqt67-dev-all + - linux: py312-test-pyqt515-dev-all + - linux: py312-test-pyqt67-dev + - linux: py313-test-pyqt66-dev-all allowed_failures: needs: initial_checks diff --git a/glue_qt/viewers/profile/tests/test_data_viewer.py b/glue_qt/viewers/profile/tests/test_data_viewer.py index 2a5b09f6..39662f9c 100644 --- a/glue_qt/viewers/profile/tests/test_data_viewer.py +++ b/glue_qt/viewers/profile/tests/test_data_viewer.py @@ -498,8 +498,10 @@ def test_unit_conversion_limits(): assert viewer.state.x_min == 3.0 assert viewer.state.x_max == 3.0 - assert viewer.state.y_min == 0. - assert viewer.state.y_max == 1. + + # Limits for constant data == 3.0; this was broken up to glue-core 1.21.1 (glue-viz/glue#2513) + assert viewer.state.y_min in (2.7, 0.0) + assert viewer.state.y_max in (3.3, 1.0) # Explicitly set unit on y axis to enable unit conversion viewer.state.y_display_unit = 'Jy' diff --git a/tox.ini b/tox.ini index 2b4faba8..38db8122 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{38,39,310,311,312}-{codestyle,test,docs}-{pyqt514,pyqt515,pyside514,pyside515,pyqt63,pyqt64,pyqt66,pyqt67,pyqt65,pyqt63,pyside66,pyside67}-all-{dev,legacy} + py{38,39,310,311,312,313}-{codestyle,test,docs}-{pyqt514,pyqt515,pyside514,pyside515,pyqt63,pyqt64,pyqt66,pyqt67,pyqt65,pyqt63,pyside66,pyside67}-all-{dev,legacy} requires = pip >= 18.0 setuptools >= 30.3.0 @@ -12,6 +12,7 @@ passenv = # Set to 1 to get more debug information from PyQt setenv = test: QT_DEBUG_PLUGINS = 0 + dev: PIP_EXTRA_INDEX_URL = https://pypi.anaconda.org/astropy/simple https://pypi.anaconda.org/scientific-python-nightly-wheels/simple whitelist_externals = find rm @@ -40,8 +41,9 @@ deps = pyside65: PySide6==6.5.* pyside66: PySide6==6.6.* pyside67: PySide6==6.7.* - dev: git+https://github.com/numpy/numpy - dev: git+https://github.com/astropy/astropy + dev: numpy>=0.0.dev0 + dev: astropy>=0.0.dev0 + dev: git+https://github.com/glue-viz/glue lts: astropy==5.0.* lts: matplotlib==3.5.* # Pin numpy-lts until permanent solution for #2353/#2428