Update from global requirements

Change-Id: I539722519c3f558a6ce86a25ef18bb021a65f3b7
This commit is contained in:
Ekaterina Chernova 2015-03-27 15:15:51 +03:00
parent 2e3eb5e4ac
commit 2a4454467f
3 changed files with 15 additions and 7 deletions

View File

@ -5,17 +5,17 @@ pbr>=0.6,!=0.7,<1.0
argparse argparse
PrettyTable>=0.7,<0.8 PrettyTable>=0.7,<0.8
python-glanceclient>=0.15.0 python-glanceclient>=0.15.0
python-keystoneclient>=0.11.1 python-keystoneclient>=1.1.0
httplib2>=0.7.5 httplib2>=0.7.5
iso8601>=0.1.9 iso8601>=0.1.9
six>=1.7.0 six>=1.9.0
Babel>=1.3 Babel>=1.3
pyOpenSSL>=0.11 pyOpenSSL>=0.11
requests>=2.2.0,!=2.4.0 requests>=2.2.0,!=2.4.0
PyYAML>=3.1.0 PyYAML>=3.1.0
oslo.serialization>=1.0.0 # Apache-2.0 oslo.serialization>=1.4.0,<1.5.0 # Apache-2.0
oslo.utils>=1.1.0 # Apache-2.0 oslo.utils>=1.4.0,<1.5.0 # Apache-2.0
# not listed in global requirements # not listed in global requirements
yaql>=0.2.3,<0.3 yaql>=0.2.3,<0.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

@ -7,10 +7,10 @@ coverage>=3.6
discover discover
fixtures>=0.3.14 fixtures>=0.3.14
mock>=1.0 mock>=1.0
tempest-lib tempest-lib>=0.4.0
testrepository>=0.0.18 testrepository>=0.0.18
testscenarios>=0.4 testscenarios>=0.4
testtools>=0.9.34 testtools>=0.9.36,!=1.2.0
# doc build requirements # doc build requirements
sphinx>=1.1.2,<1.2 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3