[ARVADOS] updated: d1327f9456b561c059c18c76f63391728ce1780d
git at public.curoverse.com
git at public.curoverse.com
Wed Sep 16 17:31:11 EDT 2015
Summary of changes:
sdk/pam/setup.py | 2 +-
sdk/python/setup.py | 2 +-
services/dockercleaner/setup.py | 1 +
services/fuse/setup.py | 2 +-
services/nodemanager/setup.py | 2 +-
5 files changed, 5 insertions(+), 4 deletions(-)
via d1327f9456b561c059c18c76f63391728ce1780d (commit)
via 5e577ab8c2e6c3a16291d4ff159da6d51220088b (commit)
via a5b3f79e550828b3140f10676917e1f39d8eb200 (commit)
via 230a59b8dcb503b5b4240c178eedce97a73f16b8 (commit)
from 8806f2d513766f55333807a161ff53b35c6ba6f0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit d1327f9456b561c059c18c76f63391728ce1780d
Merge: 8806f2d 5e577ab
Author: Brett Smith <brett at curoverse.com>
Date: Wed Sep 16 17:30:37 2015 -0400
Merge branch 'pr/24'
Closes #7262.
commit 5e577ab8c2e6c3a16291d4ff159da6d51220088b
Author: Joshua C. Randall <jcrandall at alum.mit.edu>
Date: Tue Sep 15 10:58:15 2015 +0000
7262: blacklists pbr >= 1.7.0
diff --git a/sdk/pam/setup.py b/sdk/pam/setup.py
index fe341ab..d261ceb 100755
--- 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=['pbr!=1.7.0', 'mock>=1.0', 'python-pam'],
+ tests_require=['pbr<1.7.0', 'mock>=1.0', 'python-pam'],
zip_safe=False,
cmdclass={'egg_info': tagger},
)
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index 419b0fb..23a3793 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -44,7 +44,7 @@ setup(name='arvados-python-client',
'ws4py'
],
test_suite='tests',
- tests_require=['pbr!=1.7.0', 'mock>=1.0', 'PyYAML'],
+ tests_require=['pbr<1.7.0', 'mock>=1.0', 'PyYAML'],
zip_safe=False,
cmdclass={'egg_info': tagger},
)
diff --git a/services/dockercleaner/setup.py b/services/dockercleaner/setup.py
index 0a1f2f1..5944638 100644
--- a/services/dockercleaner/setup.py
+++ b/services/dockercleaner/setup.py
@@ -25,7 +25,7 @@ setup(name="arvados-docker-cleaner",
'docker-py',
],
tests_require=[
- 'pbr!=1.7.0',
+ 'pbr<1.7.0',
'mock',
],
test_suite='tests',
diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index 3ea6b63..d7ac773 100644
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -35,7 +35,7 @@ setup(name='arvados_fuse',
'ciso8601'
],
test_suite='tests',
- tests_require=['pbr!=1.7.0', 'mock>=1.0', 'PyYAML'],
+ tests_require=['pbr<1.7.0', 'mock>=1.0', 'PyYAML'],
zip_safe=False,
cmdclass={'egg_info': tagger},
)
diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py
index d090868..e7dcec9 100644
--- a/services/nodemanager/setup.py
+++ b/services/nodemanager/setup.py
@@ -35,7 +35,7 @@ setup(name='arvados-node-manager',
],
scripts=['bin/arvados-node-manager'],
test_suite='tests',
- tests_require=['pbr!=1.7.0', 'mock>=1.0', "apache-libcloud==0.18.1.dev3"],
+ tests_require=['pbr<1.7.0', 'mock>=1.0', "apache-libcloud==0.18.1.dev3"],
zip_safe=False,
cmdclass={'egg_info': tagger},
)
commit a5b3f79e550828b3140f10676917e1f39d8eb200
Author: Joshua C. Randall <jcrandall at alum.mit.edu>
Date: Thu Sep 10 14:31:16 2015 +0100
Puts pbr 1.7.0 on blacklist for services/dockercleaner
diff --git a/services/dockercleaner/setup.py b/services/dockercleaner/setup.py
index a799ffe..0a1f2f1 100644
--- a/services/dockercleaner/setup.py
+++ b/services/dockercleaner/setup.py
@@ -25,6 +25,7 @@ setup(name="arvados-docker-cleaner",
'docker-py',
],
tests_require=[
+ 'pbr!=1.7.0',
'mock',
],
test_suite='tests',
commit 230a59b8dcb503b5b4240c178eedce97a73f16b8
Author: Joshua C. Randall <jcrandall at alum.mit.edu>
Date: Thu Sep 10 11:37:25 2015 +0000
Blacklists pbr version 1.7.0 as it is not working with mock 1.3.0
diff --git a/sdk/pam/setup.py b/sdk/pam/setup.py
index 4915388..fe341ab 100755
--- 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},
)
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index 5c0b09d..419b0fb 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -44,7 +44,7 @@ setup(name='arvados-python-client',
'ws4py'
],
test_suite='tests',
- tests_require=['mock>=1.0', 'PyYAML'],
+ tests_require=['pbr!=1.7.0', 'mock>=1.0', 'PyYAML'],
zip_safe=False,
cmdclass={'egg_info': tagger},
)
diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index 3833493..3ea6b63 100644
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -35,7 +35,7 @@ setup(name='arvados_fuse',
'ciso8601'
],
test_suite='tests',
- tests_require=['mock>=1.0', 'PyYAML'],
+ tests_require=['pbr!=1.7.0', 'mock>=1.0', 'PyYAML'],
zip_safe=False,
cmdclass={'egg_info': tagger},
)
diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py
index 6d85e86..d090868 100644
--- a/services/nodemanager/setup.py
+++ b/services/nodemanager/setup.py
@@ -35,7 +35,7 @@ setup(name='arvados-node-manager',
],
scripts=['bin/arvados-node-manager'],
test_suite='tests',
- tests_require=['mock>=1.0', "apache-libcloud==0.18.1.dev3"],
+ tests_require=['pbr!=1.7.0', 'mock>=1.0', "apache-libcloud==0.18.1.dev3"],
zip_safe=False,
cmdclass={'egg_info': tagger},
)
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list