From 2557c47668ad822810aad523643014c6a5d4a064 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 24 Jun 2015 14:59:26 -0400 Subject: [PATCH] Updated from global requirements This patch takes the latest global requirements update from change Ibcb49412a012f79be2f7fd697349ddbf43bd7b9b except takes out the update to setup.py which reverts the windows specific requirements. We are still working on getting the custom changes out of setup.py in change I3c07c279d33f6aed46c3a97dd9ba81251e51429a. Change-Id: Iee7612d39b520cf04e3b2ec503ec79d23f15f949 --- requirements.txt | 42 +++++++++++++++++++++--------------------- setup.cfg | 0 test-requirements.txt | 14 +++++++------- 3 files changed, 28 insertions(+), 28 deletions(-) mode change 100755 => 100644 setup.cfg diff --git a/requirements.txt b/requirements.txt index 6a11e8372..9d4e1c260 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,38 +1,38 @@ # 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 # process, which may cause wedges in the gate later. -pbr>=0.11,<2.0 +pbr<2.0,>=0.11 Paste PasteDeploy>=1.5.0 -Routes>=1.12.3,!=2.0 -debtcollector>=0.3.0 # Apache-2.0 -eventlet>=0.17.3 +Routes!=2.0,>=1.12.3 +debtcollector>=0.3.0 # Apache-2.0 +eventlet>=0.17.4 greenlet>=0.3.2 httplib2>=0.7.5 requests>=2.5.2 -Jinja2>=2.6 # BSD License (3 clause) +Jinja2>=2.6 # BSD License (3 clause) keystonemiddleware>=1.5.0 netaddr>=0.7.12 -python-neutronclient>=2.3.11,<3 -retrying>=1.2.3,!=1.3.0 # Apache-2.0 -SQLAlchemy>=0.9.7,<1.1.0 +python-neutronclient<3,>=2.3.11 +retrying!=1.3.0,>=1.2.3 # Apache-2.0 +SQLAlchemy<1.1.0,>=0.9.7 WebOb>=1.2.3 python-keystoneclient>=1.6.0 alembic>=0.7.2 six>=1.9.0 -stevedore>=1.5.0 # Apache-2.0 -oslo.concurrency>=2.0.0 # Apache-2.0 -oslo.config>=1.11.0 # Apache-2.0 -oslo.context>=0.2.0 # Apache-2.0 -oslo.db>=1.10.0 # Apache-2.0 -oslo.i18n>=1.5.0 # Apache-2.0 -oslo.log>=1.2.0 # Apache-2.0 -oslo.messaging>=1.8.0 # Apache-2.0 -oslo.middleware>=1.2.0,!=2.0.0 # Apache-2.0 -oslo.policy>=0.5.0 # Apache-2.0 -oslo.rootwrap>=2.0.0 # Apache-2.0 -oslo.serialization>=1.4.0 # Apache-2.0 -oslo.utils>=1.6.0 # Apache-2.0 +stevedore>=1.5.0 # Apache-2.0 +oslo.concurrency>=2.1.0 # Apache-2.0 +oslo.config>=1.11.0 # Apache-2.0 +oslo.context>=0.2.0 # Apache-2.0 +oslo.db>=1.10.0 # Apache-2.0 +oslo.i18n>=1.5.0 # Apache-2.0 +oslo.log>=1.2.0 # Apache-2.0 +oslo.messaging!=1.12.0,>=1.8.0 # Apache-2.0 +oslo.middleware!=2.0.0,>=1.2.0 # Apache-2.0 +oslo.policy>=0.5.0 # Apache-2.0 +oslo.rootwrap>=2.0.0 # Apache-2.0 +oslo.serialization>=1.4.0 # Apache-2.0 +oslo.utils>=1.6.0 # Apache-2.0 python-novaclient>=2.22.0 diff --git a/setup.cfg b/setup.cfg old mode 100755 new mode 100644 diff --git a/test-requirements.txt b/test-requirements.txt index ebc0e71f4..9bea5ff02 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,21 +1,21 @@ # 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 # process, which may cause wedges in the gate later. -hacking>=0.10.0,<0.11 +hacking<0.11,>=0.10.0 -cliff>=1.10.0 # Apache-2.0 +cliff>=1.13.0 # Apache-2.0 coverage>=3.6 fixtures>=0.3.14 mock>=1.0 python-subunit>=0.0.18 -requests-mock>=0.6.0 # Apache-2.0 -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 -oslosphinx>=2.5.0 # Apache-2.0 +requests-mock>=0.6.0 # Apache-2.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +oslosphinx>=2.5.0 # Apache-2.0 testrepository>=0.0.18 -testtools>=0.9.36,!=1.2.0 +testtools>=1.4.0 testscenarios>=0.4 WebTest>=2.0 -oslotest>=1.5.1 # Apache-2.0 +oslotest>=1.5.1 # Apache-2.0 os-testr>=0.1.0 tempest-lib>=0.5.0 ddt>=0.7.0 -- 2.45.2