From aa65d41dfef190a2f20eacb6ec909c29ade9d88e Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Tue, 19 Jan 2016 13:52:39 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I32c773fa8eef0303606fab34af4a430b5d47d3a6 --- requirements.txt | 10 +++++----- test-requirements.txt | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/requirements.txt b/requirements.txt index cf168d86..fe2773a2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,8 +2,8 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. cliff>=1.15.0 # Apache-2.0 -pbr>=1.6 -python-keystoneclient!=1.8.0,>=1.6.0 -python-openstackclient>=2.0.0 -PyYAML>=3.1.0 -requests!=2.9.0,>=2.8.1 +pbr>=1.6 # Apache-2.0 +python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0 # Apache-2.0 +python-openstackclient>=2.0.0 # Apache-2.0 +PyYAML>=3.1.0 # MIT +requests!=2.9.0,>=2.8.1 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 4cb34f28..e17a7b19 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,10 +3,10 @@ # process, which may cause wedges in the gate later. hacking<0.11,>=0.10 pylint==1.4.5 # GNU GPL v2 -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 -unittest2 -fixtures>=1.3.1 -mock>=1.2 -nose -tempest-lib>=0.13.0 -testtools>=1.4.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD +unittest2 # BSD +fixtures>=1.3.1 # Apache-2.0/BSD +mock>=1.2 # BSD +nose # LGPL +tempest-lib>=0.13.0 # Apache-2.0 +testtools>=1.4.0 # MIT