Merge pull request #1146 from girder/minor-tweaks

Clean up some warnings.
girder · May 4, 2023 · c34c4e8 · c34c4e8
2 parents 7029bd0 + 7906b39
commit c34c4e8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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 \