From b00d7e68d93f69761cdb5510c9eb470be1cf86c3 Mon Sep 17 00:00:00 2001 From: Colin Blackburn Date: Thu, 8 Sep 2016 11:27:18 +0100 Subject: [PATCH 1/3] Cap pytest to below 3.0 --- components/tools/OmeroFS/setup.py | 2 +- components/tools/OmeroPy/setup.py | 2 +- components/tools/OmeroWeb/setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/tools/OmeroFS/setup.py b/components/tools/OmeroFS/setup.py index af0c3dd9782..6c559954729 100755 --- a/components/tools/OmeroFS/setup.py +++ b/components/tools/OmeroFS/setup.py @@ -33,4 +33,4 @@ package_dir={"": "target"}, packages=[''], cmdclass={'test': PyTest}, - tests_require=['pytest']) + tests_require=['pytest<3.0.0']) diff --git a/components/tools/OmeroPy/setup.py b/components/tools/OmeroPy/setup.py index 7cfcc8e0016..3e336b5b054 100755 --- a/components/tools/OmeroPy/setup.py +++ b/components/tools/OmeroPy/setup.py @@ -67,4 +67,4 @@ 'omero.gateway': ['pilfonts/*'], 'omero.gateway.scripts': ['imgs/*']}, cmdclass={'test': PyTest}, - tests_require=['pytest']) + tests_require=['pytest<3.0.0']) diff --git a/components/tools/OmeroWeb/setup.py b/components/tools/OmeroWeb/setup.py index c5a2b971006..5da67aba21e 100755 --- a/components/tools/OmeroWeb/setup.py +++ b/components/tools/OmeroWeb/setup.py @@ -51,5 +51,5 @@ packages=[''], test_suite='test.suite', cmdclass={'test': PyTest}, - tests_require=['pytest'], + tests_require=['pytest<3.0.0'], ) From 3a8887cb24458be0e6dbc0b7c552d5ca6bb34a76 Mon Sep 17 00:00:00 2001 From: Colin Blackburn Date: Fri, 16 Sep 2016 10:48:20 +0100 Subject: [PATCH 2/3] Exclude broken pytest versions rather than capping --- components/tools/OmeroFS/setup.py | 2 +- components/tools/OmeroPy/setup.py | 2 +- components/tools/OmeroWeb/setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/tools/OmeroFS/setup.py b/components/tools/OmeroFS/setup.py index 6c559954729..d394e961392 100755 --- a/components/tools/OmeroFS/setup.py +++ b/components/tools/OmeroFS/setup.py @@ -33,4 +33,4 @@ package_dir={"": "target"}, packages=[''], cmdclass={'test': PyTest}, - tests_require=['pytest<3.0.0']) + tests_require=['pytest != 3.0.0, != 3.0.1, != 3.0.2']) diff --git a/components/tools/OmeroPy/setup.py b/components/tools/OmeroPy/setup.py index 3e336b5b054..0d0a809121a 100755 --- a/components/tools/OmeroPy/setup.py +++ b/components/tools/OmeroPy/setup.py @@ -67,4 +67,4 @@ 'omero.gateway': ['pilfonts/*'], 'omero.gateway.scripts': ['imgs/*']}, cmdclass={'test': PyTest}, - tests_require=['pytest<3.0.0']) + tests_require=['pytest != 3.0.0, != 3.0.1, != 3.0.2']) diff --git a/components/tools/OmeroWeb/setup.py b/components/tools/OmeroWeb/setup.py index 5da67aba21e..68029b369dc 100755 --- a/components/tools/OmeroWeb/setup.py +++ b/components/tools/OmeroWeb/setup.py @@ -51,5 +51,5 @@ packages=[''], test_suite='test.suite', cmdclass={'test': PyTest}, - tests_require=['pytest<3.0.0'], + tests_require=['pytest != 3.0.0, != 3.0.1, != 3.0.2'], ) From 48b661e70b55202c11250239f9cca552d19e6022 Mon Sep 17 00:00:00 2001 From: Colin Blackburn Date: Fri, 16 Sep 2016 10:48:59 +0100 Subject: [PATCH 3/3] Update copyright dates --- components/tools/OmeroFS/setup.py | 2 +- components/tools/OmeroPy/setup.py | 2 +- components/tools/OmeroWeb/setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/tools/OmeroFS/setup.py b/components/tools/OmeroFS/setup.py index d394e961392..e940199b06c 100755 --- a/components/tools/OmeroFS/setup.py +++ b/components/tools/OmeroFS/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- """ - Copyright 2008 Glencoe Software, Inc. All rights reserved. + Copyright 2008-2016 Glencoe Software, Inc. All rights reserved. Use is subject to license terms supplied in LICENSE.txt """ diff --git a/components/tools/OmeroPy/setup.py b/components/tools/OmeroPy/setup.py index 0d0a809121a..51bd85ae2f7 100755 --- a/components/tools/OmeroPy/setup.py +++ b/components/tools/OmeroPy/setup.py @@ -26,7 +26,7 @@ ./setup.py test --pdb - Copyright 2007-2013 Glencoe Software, Inc. All rights reserved. + Copyright 2007-2016 Glencoe Software, Inc. All rights reserved. Use is subject to license terms supplied in LICENSE.txt """ diff --git a/components/tools/OmeroWeb/setup.py b/components/tools/OmeroWeb/setup.py index 68029b369dc..f6d4d945355 100755 --- a/components/tools/OmeroWeb/setup.py +++ b/components/tools/OmeroWeb/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- """ - Copyright 2008 Glencoe Software, Inc. All rights reserved. + Copyright 2008-2016 Glencoe Software, Inc. All rights reserved. Use is subject to license terms supplied in LICENSE.txt """