Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2014-09-09 22:17:35 +00:00 committed by Gerrit Code Review
commit d44349d9f0
3 changed files with 16 additions and 8 deletions

View File

@ -1,2 +1,2 @@
pbr>=0.5.21,<1.0 pbr>=0.6,!=0.7,<1.0
Babel>=0.9.6 Babel>=1.3

View File

@ -17,6 +17,14 @@
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools import setuptools
# In python < 2.7.4, a lazy loading of package `pbr` will break
# setuptools if some other modules registered functions in `atexit`.
# solution from: http://bugs.python.org/issue15881#msg170215
try:
import multiprocessing # noqa
except ImportError:
pass
setuptools.setup( setuptools.setup(
setup_requires=['pbr'], setup_requires=['pbr'],
pbr=True) pbr=True)

View File

@ -3,9 +3,9 @@ hacking>=0.5.6,<0.8
coverage>=3.6 coverage>=3.6
discover discover
fixtures>=0.3.14 fixtures>=0.3.14
python-subunit python-subunit>=0.0.18
sphinx>=1.1.2 sphinx>=1.1.2,!=1.2.0,<1.3
oslosphinx oslosphinx>=2.2.0.0a2
testrepository>=0.0.17 testrepository>=0.0.18
testscenarios>=0.4,<0.5 testscenarios>=0.4
testtools>=0.9.32 testtools>=0.9.34