Merge pull request #785 from girder/change-version-check

Change how we do a version check.
girder · Feb 17, 2022 · ae63ad4 · ae63ad4
2 parents 873e4b3 + 9ea0db8
commit ae63ad4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/sources/gdal/large_image_source_gdal/girder_source.py b/sources/gdal/large_image_source_gdal/girder_source.py
@@ -15,8 +15,8 @@
 #############################################################################
 
 import re
-from distutils.version import StrictVersion
 
+import packaging.version
 from girder_large_image.girder_tilesource import GirderTileSource
 from osgeo import gdal
 
@@ -48,7 +48,7 @@ def _getLargeImagePath(self):
         try:
             largeImageFileId = self.item['largeImage']['fileId']
             largeImageFile = File().load(largeImageFileId, force=True)
-            if (StrictVersion(gdal.__version__) >= StrictVersion('2.1.3') and
+            if (packaging.version.parse(gdal.__version__) >= packaging.version.parse('2.1.3') and
                     largeImageFile.get('linkUrl') and
                     not largeImageFile.get('assetstoreId') and
                     re.match(r'(http(|s)|ftp)://', largeImageFile['linkUrl'])):

diff --git a/sources/gdal/setup.py b/sources/gdal/setup.py
@@ -45,6 +45,7 @@ def prerelease_local_scheme(version):
     install_requires=[
         'large-image',
         'gdal',
+        'packaging',
         'pyproj>=2.2.0',
         'importlib-metadata ; python_version < "3.8"',
     ],