diff --git a/girder/girder_large_image/web_client/webpack.helper.js b/girder/girder_large_image/web_client/webpack.helper.js index e386c0770..10ef79b1f 100644 --- a/girder/girder_large_image/web_client/webpack.helper.js +++ b/girder/girder_large_image/web_client/webpack.helper.js @@ -12,7 +12,7 @@ module.exports = function (config) { to: path.join(config.output.path, 'extra', 'geojs.js'), toType: 'file' }, { - from: path.join(path.resolve(__dirname), 'node_modules', 'sinon', 'pkg', 'sinon.js'), + from: require.resolve('sinon/pkg/sinon.js'), to: path.join(config.output.path, 'extra', 'sinon.js') }]) ); diff --git a/sources/gdal/large_image_source_gdal/__init__.py b/sources/gdal/large_image_source_gdal/__init__.py index 2a62772c5..8d9b99d35 100644 --- a/sources/gdal/large_image_source_gdal/__init__.py +++ b/sources/gdal/large_image_source_gdal/__init__.py @@ -26,6 +26,11 @@ import PIL.Image from osgeo import gdal, gdal_array, gdalconst, osr +try: + gdal.useExceptions() +except Exception: + pass + # isort: off # pyproj stopped supporting older pythons, so on those versions its database is diff --git a/test.Dockerfile b/test.Dockerfile index c987e0afd..da44b8129 100644 --- a/test.Dockerfile +++ b/test.Dockerfile @@ -20,7 +20,7 @@ RUN apt-get update && \ # general utilities \ software-properties-common \ # as specified by \ - # https://github.com/pyenv/pyenv/wiki#suggested-build-environment + # https://github.com/pyenv/pyenv/wiki#suggested-build-environment \ build-essential \ curl \ libbz2-dev \ @@ -40,7 +40,7 @@ RUN apt-get update && \ zlib1g-dev \ # for curl \ ca-certificates \ - # girder convenience + # girder convenience \ fuse \ libldap2-dev \ libsasl2-dev \ @@ -58,7 +58,7 @@ RUN apt-get update && \ libmagic-dev \ # shrink docker image \ rdfind \ - # core girder + # core girder \ gcc \ libpython3-dev \ python3-pip \