From 34ccbe0f5cb780a194d2af556c5ded606a3829a8 Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Wed, 18 Jun 2014 14:09:54 +0000
Subject: [PATCH] Updated from global requirements

Change-Id: Ia530a081e2f6aa5f913110f4949b38739ad69310
---
 requirements.txt      | 2 +-
 test-requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index a5fa790..56a5312 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ netaddr>=0.7.6
 iso8601>=0.1.9
 
 # for jsonutils
-six>=1.6.0
+six>=1.7.0
 
 # used by openstack/common/gettextutils.py
 Babel>=1.3
diff --git a/test-requirements.txt b/test-requirements.txt
index 4e4649f..546ff35 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -16,5 +16,5 @@ testtools>=0.9.34
 coverage>=3.6
 
 # this is required for the docs build jobs
-sphinx>=1.2.1,<1.3
+sphinx>=1.1.2,!=1.2.0,<1.3
 oslosphinx