From 22eb795620c33fe7d8007ab27305e0844b937ef9 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Mon, 28 Mar 2016 19:32:45 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I73cdaf060097c29d671fe0f9350819826b60d411 --- requirements.txt | 4 ++-- test-requirements.txt | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/requirements.txt b/requirements.txt index f69ec56e..fc7ce509 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,6 +2,6 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=1.6 -Babel>=1.3 +pbr>=1.6 # Apache-2.0 +Babel>=1.3 # BSD -e git://git.openstack.org/openstack/neutron.git@master#egg=neutron diff --git a/test-requirements.txt b/test-requirements.txt index 9acbcc9e..4f030e0e 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,12 +4,12 @@ hacking<0.11,>=0.10.0 -coverage>=3.6 -python-subunit>=0.0.18 -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 -oslosphinx>=2.5.0 # Apache-2.0 +coverage>=3.6 # Apache-2.0 +python-subunit>=0.0.18 # Apache-2.0/BSD +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD +oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0 -os-testr>=0.4.1 -testrepository>=0.0.18 -testscenarios>=0.4 -testtools>=1.4.0 +os-testr>=0.4.1 # Apache-2.0 +testrepository>=0.0.18 # Apache-2.0/BSD +testscenarios>=0.4 # Apache-2.0/BSD +testtools>=1.4.0 # MIT