From 909d0c67e97a171137b6b584b1e3843e3f1394b2 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Tue, 19 Jan 2016 13:53:11 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I5edbb0a99eaaa7255906e714a394fe670d2910a1 --- requirements.txt | 10 +++++----- test-requirements.txt | 30 +++++++++++++++--------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/requirements.txt b/requirements.txt index c0a10ebe..65feb6ef 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,13 @@ # 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>=1.6 -requests!=2.9.0,>=2.8.1 -six>=1.9.0 +pbr>=1.6 # Apache-2.0 +requests!=2.9.0,>=2.8.1 # Apache-2.0 +six>=1.9.0 # MIT stevedore>=1.5.0 # Apache-2.0 -jsonschema!=2.5.0,<3.0.0,>=2.0.0 +jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT # Oslo Packages oslo.i18n>=1.5.0 # Apache-2.0 -python-keystoneclient!=1.8.0,>=1.6.0 +python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index e36b9b6f..616c2fee 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,26 +5,26 @@ hacking<0.11,>=0.10.2 # Unit testing -discover -fixtures>=1.3.1 -mock>=1.2 -python-subunit>=0.0.18 -testrepository>=0.0.18 -testtools>=1.4.0 +discover # BSD +fixtures>=1.3.1 # Apache-2.0/BSD +mock>=1.2 # BSD +python-subunit>=0.0.18 # Apache-2.0/BSD +testrepository>=0.0.18 # Apache-2.0/BSD +testtools>=1.4.0 # MIT # Test runner -nose -nose-exclude -openstack.nose-plugin>=0.7 +nose # LGPL +nose-exclude # LGPL +openstack.nose-plugin>=0.7 # Apache-2.0 # Metrics and style -coverage>=3.6 +coverage>=3.6 # Apache-2.0 -ddt>=1.0.1 +ddt>=1.0.1 # MIT # Documentation -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 -os-client-config>=1.13.1 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD +os-client-config>=1.13.1 # Apache-2.0 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 -openstack-doc-tools>=0.23 -python-openstackclient>=2.0.0 +openstack-doc-tools>=0.23 # Apache-2.0 +python-openstackclient>=2.0.0 # Apache-2.0