Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Skip test_save_aggregate_slice for Numpy 1.25.x and unpin numpy-dev #2429

Merged
merged 2 commits into from
Aug 9, 2023
Merged
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
1 change: 1 addition & 0 deletions .github/workflows/ci_workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ jobs:
- linux: py310-test-pyqt63-all
- linux: py310-test-pyqt64-all
- linux: py311-test-pyqt514
- linux: py311-test-pyqt515-lts-all

# Documentation build
- linux: py38-docs-pyqt514
Expand Down
4 changes: 4 additions & 0 deletions glue/viewers/image/qt/tests/test_data_viewer.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import os
import gc
from collections import Counter
from packaging.version import Version

import pytest

Expand Down Expand Up @@ -30,6 +31,8 @@

from ..data_viewer import ImageViewer

NPY_GE_1_25 = Version(np.__version__) >= Version('1.25')

DATA = os.path.join(os.path.dirname(__file__), 'data')


Expand Down Expand Up @@ -663,6 +666,7 @@ def test_linking_and_enabling(self):
assert not self.viewer.layers[2].enabled # image subset
assert self.viewer.layers[3].enabled # scatter subset

@pytest.mark.skipif(NPY_GE_1_25, reason='`np.sum` can not be serialized after numpy/numpy#23020')
def test_save_aggregate_slice(self, tmpdir):

# Regression test to make sure that image viewers that include
Expand Down
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,12 @@ deps =
pyside515: PySide2==5.15.*
pyside63: PySide6==6.3.*
pyside64: PySide6==6.4.*
# Pin numpy-dev until #2353 is resolved
dev: git+https://github.com/numpy/numpy@9b6a7b4f8
dev: git+https://github.com/numpy/numpy
dev: git+https://github.com/astropy/astropy
lts: astropy==5.0.*
lts: matplotlib==3.5.*
# Pin numpy-lts until permanent solution for #2353/#2428
lts: numpy==1.24.*
legacy: numpy==1.17.*
legacy: matplotlib==3.2.*
legacy: scipy==1.1.*
Expand Down
Loading