Merge pull request #1163 from girder/require-newer-girder

Require a newer version of girder.
girder · May 22, 2023 · 1889f7d · 1889f7d
2 parents af524dc + 4d4639d
commit 1889f7d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 ### Changes
 - Rename tiff exceptions to be better follow python standards ([#1162](../../pull/1162))
+- Require a newer version of girder ([#1163](../../pull/1163))
 
 ### Bug Fixes
 - The deepzoom tile source misreported the format of its tile output ([#1158](../../pull/1158))

diff --git a/girder/girder_large_image/web_client/package.json b/girder/girder_large_image/web_client/package.json
@@ -27,7 +27,7 @@
         "vue-color": "^2.8.1",
         "vue-loader": "~15.9.8",
         "vue-template-compiler": "~2.6.14",
-        "webpack": "^2.7.0",
+        "webpack": "^3",
         "yaml": "^2.1.1"
     },
     "main": "./index.js",

diff --git a/girder/setup.py b/girder/setup.py
@@ -53,7 +53,7 @@ def prerelease_local_scheme(version):
         'Programming Language :: Python :: 3.11',
     ],
     install_requires=[
-        'girder>=3.0.4',
+        'girder>=3.1.18',
         'girder-jobs>=3.0.3',
         f'large_image{limit_version}',
         'importlib-metadata<5 ; python_version < "3.8"',

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,6 +1,5 @@
 # Top level dependencies
-girder>=3.0.4 ; python_version < '3.8'
-girder>=3.0.14 ; python_version >= '3.8'
+girder>=3.1.18
 girder-jobs>=3.0.3
 -e sources/bioformats
 -e sources/deepzoom

diff --git a/requirements-test.txt b/requirements-test.txt
@@ -1,6 +1,5 @@
 # Top level dependencies
-girder>=3.0.4 ; python_version < '3.8'
-girder>=3.0.14 ; python_version >= '3.8'
+girder>=3.1.18
 girder-jobs>=3.0.3
 sources/bioformats
 sources/deepzoom