From 6a0a42de364c32b77cf57dafbc1b74e8eb580ce1 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Sun, 17 Jan 2016 01:14:54 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I57d45c101c8ba8b2975c3df5c25a541d7827cc06 --- requirements.txt | 6 +++--- test-requirements.txt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3dc0aed..04a88d4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,10 +2,10 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -Babel>=1.3 +Babel>=1.3 # BSD oslo.log>=1.14.0 # Apache-2.0 oslo.i18n>=1.5.0 # Apache-2.0 oslo.config>=3.2.0 # Apache-2.0 oslo.utils>=3.2.0 # Apache-2.0 -enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' -cffi +enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD +cffi # MIT diff --git a/test-requirements.txt b/test-requirements.txt index aa9ea37..a8302e2 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,9 +4,9 @@ hacking<0.11,>=0.10.2 oslotest>=1.10.0 # Apache-2.0 -mock>=1.2 -fixtures>=1.3.1 +mock>=1.2 # BSD +fixtures>=1.3.1 # Apache-2.0/BSD # These are needed for docs generation oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD