Sync with requirements

Manual sync with global requirements.

Also, add python-neutronclient so that python27 tests pass. The
requirement was missing.

Change-Id: I45037b63035e185d61f19deadbe7c3eab2d1be3b
This commit is contained in:
Andreas Jaeger 2016-02-15 16:36:37 +01:00 committed by Dimitri Mazmanov
parent a14da0d86f
commit 6e68941457
3 changed files with 52 additions and 49 deletions

View File

@ -1,43 +1,46 @@
# The order of packages is significant, because pip processes them in the order # The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
pbr>=1.6 pbr>=1.6 # Apache-2.0
Babel>=1.3 Babel>=1.3 # BSD
Paste Paste # MIT
PasteDeploy>=1.5.0 PasteDeploy>=1.5.0 # MIT
Routes!=2.0,!=2.1,>=1.12.3;python_version=='2.7' Routes!=2.0,!=2.1,>=1.12.3;python_version=='2.7' # MIT
Routes!=2.0,>=1.12.3;python_version!='2.7' Routes!=2.0,>=1.12.3;python_version!='2.7' # MIT
debtcollector>=0.3.0 # Apache-2.0 debtcollector>=1.2.0 # Apache-2.0
eventlet>=0.17.4 eventlet>=0.18.2 # MIT
pecan>=1.0.0 pecan>=1.0.0 # BSD
greenlet>=0.3.2 greenlet>=0.3.2 # MIT
httplib2>=0.7.5 httplib2>=0.7.5 # MIT
requests!=2.8.0,>=2.5.2 requests!=2.9.0,>=2.8.1 # Apache-2.0
Jinja2>=2.8 # BSD License (3 clause) Jinja2>=2.8 # BSD License (3 clause)
keystonemiddleware!=2.4.0,>=2.0.0 keystonemiddleware!=4.1.0,>=4.0.0 # Apache-2.0
netaddr!=0.7.16,>=0.7.12 netaddr!=0.7.16,>=0.7.12 # BSD
retrying!=1.3.0,>=1.2.3 # Apache-2.0 retrying!=1.3.0,>=1.2.3 # Apache-2.0
SQLAlchemy<1.1.0,>=0.9.9 SQLAlchemy<1.1.0,>=1.0.10 # MIT
WebOb>=1.2.3 WebOb>=1.2.3 # MIT
python-keystoneclient!=1.8.0,>=1.6.0 python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0 # Apache-2.0
alembic>=0.8.0 alembic>=0.8.0 # MIT
six>=1.9.0 six>=1.9.0 # MIT
stevedore>=1.5.0 # Apache-2.0 stevedore>=1.5.0 # Apache-2.0
oslo.concurrency>=2.3.0 # Apache-2.0 oslo.concurrency>=2.3.0 # Apache-2.0
oslo.config>=2.6.0 # Apache-2.0 oslo.config>=3.4.0 # Apache-2.0
oslo.context>=0.2.0 # Apache-2.0 oslo.context>=0.2.0 # Apache-2.0
oslo.db>=3.0.0 # Apache-2.0 oslo.db>=4.1.0 # Apache-2.0
oslo.i18n>=1.5.0 # Apache-2.0 oslo.i18n>=2.1.0 # Apache-2.0
oslo.log>=1.12.0 # Apache-2.0 oslo.log>=1.14.0 # Apache-2.0
oslo.messaging!=2.8.0,>2.6.1 # Apache-2.0 oslo.messaging>=4.0.0 # Apache-2.0
oslo.middleware>=2.9.0 # Apache-2.0 oslo.middleware>=3.0.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.serialization>=1.10.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0
oslo.service>=0.12.0 # Apache-2.0 oslo.service>=1.0.0 # Apache-2.0
oslo.utils!=2.6.0,>=2.4.0 # Apache-2.0 oslo.utils>=3.4.0 # Apache-2.0
oslo.versionedobjects>=0.9.0 oslo.versionedobjects>=1.5.0 # Apache-2.0
SQLAlchemy<1.1.0,>=0.9.9 sqlalchemy-migrate>=0.9.6 # Apache-2.0
sqlalchemy-migrate>=0.9.6 python-openstackclient>=2.0.0 # Apache-2.0
python-openstackclient>=1.5.0 python-neutronclient>=2.6.0 # Apache-2.0
python-cinderclient>=1.3.1 # Apache-2.0
python-novaclient>=2.29.0,!=2.33.0 # Apache-2.0
python-keystoneclient>=1.6.0,!=1.8.0,!=2.1.0 # Apache-2.0

View File

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

View File

@ -3,21 +3,21 @@
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
hacking<0.11,>=0.10.2 hacking<0.11,>=0.10.2
cliff>=1.14.0 # Apache-2.0 cliff!=1.16.0,>=1.15.0 # Apache-2.0
coverage>=3.6 coverage>=3.6 # Apache-2.0
fixtures>=1.3.1 fixtures>=1.3.1 # Apache-2.0/BSD
mock>=1.2 mock>=1.2 # BSD
python-subunit>=0.0.18 python-subunit>=0.0.18 # Apache-2.0/BSD
requests-mock>=0.6.0 # Apache-2.0 requests-mock>=0.7.0 # Apache-2.0
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
oslosphinx>=2.5.0 # Apache-2.0 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
testrepository>=0.0.18 testrepository>=0.0.18 # Apache-2.0/BSD
testtools>=1.4.0 testtools>=1.4.0 # MIT
testresources>=0.2.4 testresources>=0.2.4 # Apache-2.0/BSD
testscenarios>=0.4 testscenarios>=0.4 # Apache-2.0/BSD
WebTest>=2.0 WebTest>=2.0 # MIT
oslotest>=1.10.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0
os-testr>=0.4.1 os-testr>=0.4.1 # Apache-2.0
tempest-lib>=0.10.0 tempest-lib>=0.14.0 # Apache-2.0
ddt>=0.7.0 ddt>=1.0.1 # MIT
pylint==1.4.4 # GNU GPL v2 pylint==1.4.5 # GNU GPL v2