Merge pull request #1137 from girder/adjust-requirements

Adjust requirements to improve testing.
girder · May 2, 2023 · 2aa0e28 · 2aa0e28
2 parents 22c2e2d + a9b1c21
commit 2aa0e28
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/requirements-test.txt b/requirements-test.txt
@@ -30,7 +30,8 @@ girder_annotation/.
 # Extras from main setup.py
 pylibmc>=1.5.1
 matplotlib
-simplejpeg
+simplejpeg ; python_version >= "3.7"
+simplejpeg<1.6.6 ; python_version < "3.7"
 
 # External dependencies
 pip>=9

diff --git a/setup.py b/setup.py
@@ -65,7 +65,9 @@ def prerelease_local_scheme(version):
 }
 extraReqs.update(sources)
 extraReqs['sources'] = list(set(itertools.chain.from_iterable(sources.values())))
-extraReqs['all'] = list(set(itertools.chain.from_iterable(extraReqs.values())))
+extraReqs['all'] = list(set(itertools.chain.from_iterable(extraReqs.values())) | set([
+    f'large-image-source-pil[all]{limit_version}',
+]))
 
 setup(
     name='large-image',