Updated from global requirements

Change-Id: I46186b2dc8d0e01bea982b4cab6347bcd86bf558

requirements.txt

@@ -5,4 +5,4 @@ python-keystoneclient>=0.9.0
 requests>=1.1
 simplejson>=2.0.9
 Babel>=1.3
-six>=1.6.0
+six>=1.7.0

test-requirements.txt

@@ -4,8 +4,8 @@ coverage>=3.6
 discover
 fixtures>=0.3.14
 mock>=1.0
-httpretty>=0.8.0
+httpretty>=0.8.0,!=0.8.1,!=0.8.2
 python-subunit>=0.0.18
-sphinx>=1.2.1,<1.3
+sphinx>=1.1.2,!=1.2.0,<1.3
 testtools>=0.9.34
 testrepository>=0.0.18