From 5c14a7b760bab431399acc8fa8d2937c459241ce Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Sun, 17 Jan 2016 01:16:18 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I50eb3f113f0f24b612ede52c3aedc8cbfb6a8e95 --- requirements.txt | 6 +++--- test-requirements.txt | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/requirements.txt b/requirements.txt index f8b50728d2..0406308cd4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ # 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. -fixtures>=1.3.1 -Parsley -six>=1.9.0 +fixtures>=1.3.1 # Apache-2.0/BSD +Parsley # MIT +six>=1.9.0 # MIT diff --git a/test-requirements.txt b/test-requirements.txt index 076dfd7fcd..e87c04e837 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,13 +4,13 @@ # NOTE: These are requirements for testing the requirements project only # See global-requirements for the actual requirements list hacking<0.11,>=0.10 -packaging>=15.2 -testrepository>=0.0.18 -testscenarios>=0.4 -testtools>=1.4.0 -virtualenv -setuptools>=16.0 +packaging>=15.2 # Apache-2.0 +testrepository>=0.0.18 # Apache-2.0/BSD +testscenarios>=0.4 # Apache-2.0/BSD +testtools>=1.4.0 # MIT +virtualenv # MIT +setuptools>=16.0 # PSF/ZPL # this is required for the docs build jobs -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0