Updated from global requirements

Change-Id: Ie9ea577f35f1eb6fc71876be0d4f721887f1d769

requirements.txt

@@ -4,5 +4,5 @@ httplib2>=0.7.5
 lxml>=2.3
 pbr>=0.6,!=0.7,<1.0
 PrettyTable>=0.7,<0.8
-python-keystoneclient>=0.8.0
-six>=1.6.0
+python-keystoneclient>=0.9.0
+six>=1.7.0

setup.py

@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

test-requirements.txt

@@ -6,6 +6,6 @@ hacking>=0.8.0,<0.9
 mock>=1.0
 oslosphinx
 python-subunit>=0.0.18
-sphinx>=1.1.2,<1.2
+sphinx>=1.1.2,!=1.2.0,<1.3
 testrepository>=0.0.18
 testtools>=0.9.34