From a9b1c21362b2f468441439718e0d467ee2dbf08a Mon Sep 17 00:00:00 2001 From: David Manthey Date: Tue, 2 May 2023 09:24:30 -0400 Subject: [PATCH] Adjust requirements to improve testing. --- requirements-test.txt | 3 ++- setup.py | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/requirements-test.txt b/requirements-test.txt index d7f3e03ab..5807d555e 100644 --- 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 index 7eef1ad8d..e07b3218e 100644 --- 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',