From 083e87c652304324fd050cbbdb68f346623879a0 Mon Sep 17 00:00:00 2001 From: Glen Robson Date: Tue, 16 Feb 2021 15:07:47 +0000 Subject: [PATCH 1/4] Fixing incorrect error code --- iiif_validator/tests/rot_error_random.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iiif_validator/tests/rot_error_random.py b/iiif_validator/tests/rot_error_random.py index f1d496c..3c8a448 100644 --- a/iiif_validator/tests/rot_error_random.py +++ b/iiif_validator/tests/rot_error_random.py @@ -14,4 +14,4 @@ def run(self, result): self.validationInfo.check('status', result.last_status, 400, result) return result except Exception as error: - raise ValidatorError('url-check', str(error), 404, result, 'Failed to get random rotation from url: {}.'.format(url)) + raise ValidatorError('url-check', str(error), 400, result, 'Failed to get random rotation from url: {}.'.format(url)) From f64cb8dcb97b6e44a031e3f7d1569a21fe43e926 Mon Sep 17 00:00:00 2001 From: Glen Robson Date: Tue, 16 Feb 2021 15:20:51 +0000 Subject: [PATCH 2/4] Fixing python 3.5 and updating python test versions --- .travis.yml | 3 +++ setup.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c1aa3d3..ec58177 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,9 @@ python: - "2.7" - "3.5" - "3.6" + - "3.7" + - "3.8" + - "3.9" install: - pip install tox tox-travis coveralls - pip install setuptools -U diff --git a/setup.py b/setup.py index 32f945b..eb1b6b9 100644 --- a/setup.py +++ b/setup.py @@ -48,8 +48,9 @@ "lxml>=3.7.0" ], extras_require={ - ':python_version>="3.0"': ["Pillow>=3.2.0"], ':python_version<"3.0"': ["Pillow==6.2.2"], + ':python_version<="3.5"': ["Pillow>=7.2.0"] + ':python_version>="3.6"': ["Pillow>=8.0.0"], }, test_suite="tests", tests_require=["mock"]) From 11469ae6debfd0571dccaea581b14347ad79e35a Mon Sep 17 00:00:00 2001 From: Glen Robson Date: Tue, 16 Feb 2021 15:25:14 +0000 Subject: [PATCH 3/4] fixing comma's --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index eb1b6b9..c7d617e 100644 --- a/setup.py +++ b/setup.py @@ -49,8 +49,8 @@ ], extras_require={ ':python_version<"3.0"': ["Pillow==6.2.2"], - ':python_version<="3.5"': ["Pillow>=7.2.0"] - ':python_version>="3.6"': ["Pillow>=8.0.0"], + ':python_version<="3.5"': ["Pillow>=7.2.0"], + ':python_version>="3.6"': ["Pillow>=8.0.0"] }, test_suite="tests", tests_require=["mock"]) From c295882f156395ca5acf321fc8597e8ea92373cf Mon Sep 17 00:00:00 2001 From: Glen Robson Date: Tue, 16 Feb 2021 15:28:22 +0000 Subject: [PATCH 4/4] Fixing conflicting versions --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c7d617e..8682090 100644 --- a/setup.py +++ b/setup.py @@ -49,7 +49,7 @@ ], extras_require={ ':python_version<"3.0"': ["Pillow==6.2.2"], - ':python_version<="3.5"': ["Pillow>=7.2.0"], + ':python_version=="3.5"': ["Pillow>=7.2.0"], ':python_version>="3.6"': ["Pillow>=8.0.0"] }, test_suite="tests",