Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2015-07-20 02:12:22 +00:00 committed by Gerrit Code Review
commit 391010e64d
3 changed files with 11 additions and 10 deletions

View File

@ -9,7 +9,7 @@ eventlet>=0.17.4
jsonpath-rw<2.0,>=1.2.0 jsonpath-rw<2.0,>=1.2.0
jsonschema!=2.5.0,<3.0.0,>=2.0.0 jsonschema!=2.5.0,<3.0.0,>=2.0.0
kafka-python>=0.9.2 # Apache-2.0 kafka-python>=0.9.2 # Apache-2.0
keystonemiddleware>=1.5.0 keystonemiddleware>=2.0.0
lxml>=2.3 lxml>=2.3
msgpack-python>=0.4.0 msgpack-python>=0.4.0
oslo.context>=0.2.0 # Apache-2.0 oslo.context>=0.2.0 # Apache-2.0
@ -17,17 +17,17 @@ oslo.db>=1.12.0 # Apache-2.0
oslo.concurrency>=2.1.0 # Apache-2.0 oslo.concurrency>=2.1.0 # Apache-2.0
oslo.config>=1.11.0 # Apache-2.0 oslo.config>=1.11.0 # Apache-2.0
oslo.i18n>=1.5.0 # Apache-2.0 oslo.i18n>=1.5.0 # Apache-2.0
oslo.log>=1.2.0 # Apache-2.0 oslo.log>=1.6.0 # Apache-2.0
oslo.policy>=0.5.0 # Apache-2.0 oslo.policy>=0.5.0 # Apache-2.0
oslo.rootwrap>=2.0.0 # Apache-2.0 oslo.rootwrap>=2.0.0 # Apache-2.0
oslo.service>=0.1.0 # Apache-2.0 oslo.service>=0.1.0 # Apache-2.0
PasteDeploy>=1.5.0 PasteDeploy>=1.5.0
pbr<2.0,>=0.11 pbr<2.0,>=1.3
pecan>=0.8.0 pecan>=0.8.0
oslo.messaging>=1.16.0 # Apache-2.0 oslo.messaging>=1.16.0 # Apache-2.0
oslo.middleware!=2.0.0,>=1.2.0 # Apache-2.0 oslo.middleware>=2.4.0 # Apache-2.0
oslo.serialization>=1.4.0 # Apache-2.0 oslo.serialization>=1.4.0 # Apache-2.0
oslo.utils>=1.6.0 # Apache-2.0 oslo.utils>=1.9.0 # Apache-2.0
pysnmp<5.0.0,>=4.2.1 pysnmp<5.0.0,>=4.2.1
python-ceilometerclient>=1.0.13 python-ceilometerclient>=1.0.13
python-glanceclient>=0.18.0 python-glanceclient>=0.18.0

View File

@ -25,5 +25,5 @@ except ImportError:
pass pass
setuptools.setup( setuptools.setup(
setup_requires=['pbr'], setup_requires=['pbr>=1.3'],
pbr=True) pbr=True)

View File

@ -12,14 +12,15 @@ elasticsearch>=1.3.0
fixtures>=1.3.1 fixtures>=1.3.1
happybase!=0.7,>=0.5;python_version=='2.7' happybase!=0.7,>=0.5;python_version=='2.7'
httplib2>=0.7.5 httplib2>=0.7.5
mock>=1.0 mock!=1.1.4,>=1.1;python_version!='2.6'
mock==1.0.1;python_version=='2.6'
PyMySQL>=0.6.2 # MIT License PyMySQL>=0.6.2 # MIT License
# Docs Requirements # Docs Requirements
oslosphinx>=2.5.0 # Apache-2.0 oslosphinx>=2.5.0 # Apache-2.0
oslotest>=1.5.1 # Apache-2.0 oslotest>=1.7.0 # Apache-2.0
oslo.vmware>=0.13.1 # Apache-2.0 oslo.vmware>=0.13.1 # Apache-2.0
psycopg2 psycopg2
pylint==1.4.1 # GNU GPL v2 pylint==1.4.4 # GNU GPL v2
pymongo>=3.0.2 pymongo>=3.0.2
python-subunit>=0.0.18 python-subunit>=0.0.18
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2