Merge pull request #1034 from girder/nd2-311

Test nd2 source on Python 3.11.
girder · Jan 23, 2023 · 997c3c5 · 997c3c5
2 parents 47d5bf6 + 2514796
commit 997c3c5
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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))

diff --git a/sources/nd2/setup.py b/sources/nd2/setup.py
@@ -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={

diff --git a/test/test_source_multi.py b/test/test_source_multi.py
@@ -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)
@@ -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)
@@ -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)
@@ -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')

diff --git a/test/test_source_nd2.py b/test/test_source_nd2.py
@@ -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'),
 ]