Merge pull request #4858 from aleksandra-tarkowska/rebased/metadata52…

…/cap-pytest Cap pytest to below 3.0 (rebased onto metadata52)
ome · Sep 22, 2016 · 83b1e83 · 83b1e83
2 parents ea4d95c + 48b661e
commit 83b1e83
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
 
 """
@@ -33,4 +33,4 @@
       package_dir={"": "target"},
       packages=[''],
       cmdclass={'test': PyTest},
-      tests_require=['pytest'])
+      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
@@ -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
 
 """
@@ -67,4 +67,4 @@
         'omero.gateway': ['pilfonts/*'],
         'omero.gateway.scripts': ['imgs/*']},
     cmdclass={'test': PyTest},
-    tests_require=['pytest'])
+    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
@@ -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
 
 """
@@ -51,5 +51,5 @@
       packages=[''],
       test_suite='test.suite',
       cmdclass={'test': PyTest},
-      tests_require=['pytest'],
+      tests_require=['pytest != 3.0.0, != 3.0.1, != 3.0.2'],
       )