7491: Manual merge with 7491-keepclient-bugs

[arvados.git] / sdk / pam / setup.py

diff --git a/sdk/pam/setup.py b/sdk/pam/setup.py
index 49153884955465e4a1ac7d94f2c18f0e2f2a40e6..d261cebf410086694a0d2a0d1931726c6eca1631 100755 (executable)
--- a/sdk/pam/setup.py
+++ b/sdk/pam/setup.py
@@ -40,7 +40,7 @@ setup(name='arvados-pam',
           'arvados-python-client>=0.1.20150801000000',
       ],
       test_suite='tests',
-      tests_require=['mock>=1.0', 'python-pam'],
+      tests_require=['pbr<1.7.0', 'mock>=1.0', 'python-pam'],
       zip_safe=False,
       cmdclass={'egg_info': tagger},
       )