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.

Sign up for GitHub

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

Jump to bottom

Test nd2 source on Python 3.11. #1034

Merged
merged 1 commit into from
Jan 23, 2023
Merged

Test nd2 source on Python 3.11. #1034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Improvements
- Speed up rendering Girder item page metadata in some instances ([#1031](../../pull/1031))
- Speed up opening some multi source files ([#1033](../../pull/1033))
- Test nd2 source on Python 3.11 ([#1034](../../pull/1034))

### Bug Fixes
- Fix an issue with non-square tiles in the multi source ([#1032](../../pull/1032))
Expand Down
4 changes: 2 additions & 2 deletions sources/nd2/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ def prerelease_local_scheme(version):
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
# 'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.11',
],
install_requires=[
f'large-image{limit_version}',
'dask[array]',
'nd2[legacy]>=0.2.3 ; python_version >= "3.7" and python_version < "3.11"',
'nd2[legacy]>=0.2.3 ; python_version >= "3.7"',
'importlib-metadata<5 ; python_version < "3.8"',
],
extras_require={
Expand Down
4 changes: 0 additions & 4 deletions test/test_source_multi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ def testTilesFromMultiSimpleScaling():


@pytest.mark.skipif(sys.version_info < (3, 7), reason='requires python >= 3.7 for a sub-source')
@pytest.mark.skipif(sys.version_info >= (3, 11), reason='requires python3.11 wheels')
def testTilesFromMultiMultiSource(multiSourceImagePath):
imagePath = multiSourceImagePath
source = large_image_source_multi.open(imagePath)
Expand Down Expand Up @@ -125,7 +124,6 @@ def testTilesFromMultiString():


@pytest.mark.skipif(sys.version_info < (3, 7), reason='requires python >= 3.7 for a sub-source')
@pytest.mark.skipif(sys.version_info >= (3, 11), reason='requires python3.11 wheels')
def testInternalMetadata(multiSourceImagePath):
imagePath = multiSourceImagePath
source = large_image_source_multi.open(imagePath)
Expand All @@ -134,7 +132,6 @@ def testInternalMetadata(multiSourceImagePath):


@pytest.mark.skipif(sys.version_info < (3, 7), reason='requires python >= 3.7 for a sub-source')
@pytest.mark.skipif(sys.version_info >= (3, 11), reason='requires python3.11 wheels')
def testAssociatedImages(multiSourceImagePath):
imagePath = multiSourceImagePath
source = large_image_source_multi.open(imagePath)
Expand Down Expand Up @@ -194,7 +191,6 @@ def testFramesAsAxes():


@pytest.mark.skipif(sys.version_info < (3, 7), reason='requires python >= 3.7 for a sub-source')
@pytest.mark.skipif(sys.version_info >= (3, 11), reason='requires python3.11 wheels')
def testMultiComposite():
datastore.fetch('ITGA3Hi_export_crop2.nd2')
imagePath = datastore.fetch('multi-source-composite.yaml')
Expand Down
1 change: 0 additions & 1 deletion test/test_source_nd2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

pytestmark = [
pytest.mark.skipif(sys.version_info < (3, 7), reason='requires python3.7 or higher'),
pytest.mark.skipif(sys.version_info >= (3, 11), reason='requires python3.11 wheels'),
]


Expand Down