Updated from global requirements

Change-Id: Ia530a081e2f6aa5f913110f4949b38739ad69310
2014-06-18 14:09:54 +00:00 · 2014-06-18 14:09:54 +00:00 · 34ccbe0f5c
commit 34ccbe0f5c
parent 58dbb4d951
2 changed files with 2 additions and 2 deletions
--- 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
--- 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