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

Change how we do a version check. #785

Merged
merged 1 commit into from
Feb 17, 2022
Merged

Change how we do a version check. #785

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
4 changes: 2 additions & 2 deletions sources/gdal/large_image_source_gdal/girder_source.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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'])):
Expand Down
1 change: 1 addition & 0 deletions sources/gdal/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"',
],
Expand Down