Updated from global requirements

Change-Id: Ia3eb1db49c3ca06e7a0dd306fe143b11f010fc13

requirements.txt

@@ -1,15 +1,15 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-pbr>=0.6,!=0.7,<1.0
+pbr!=0.7,<1.0,>=0.6
 argparse
 iso8601>=0.1.9
 oslo.i18n<1.6.0,>=1.5.0 # Apache-2.0
 oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
-oslo.utils>=1.2.0                       # Apache-2.0
-PrettyTable>=0.7,<0.8
-requests>=2.2.0,!=2.4.0
+oslo.utils<1.5.0,>=1.4.0 # Apache-2.0
+PrettyTable<0.8,>=0.7
+requests!=2.4.0,>=2.2.0
 simplejson>=2.2.0
 six>=1.9.0
 Babel>=1.3
-python-keystoneclient>=1.1.0
+python-keystoneclient<1.4.0,>=1.2.0

setup.py

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

test-requirements.txt

@@ -1,17 +1,17 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-hacking>=0.10.0,<0.11
+hacking<0.11,>=0.10.0
 
 coverage>=3.6
 discover
-fixtures>=0.3.14
-keyring>=2.1,!=3.3
+fixtures<1.3.0,>=0.3.14
+keyring!=3.3,>=2.1
 mock<1.1.0,>=1.0
-requests-mock>=0.5.1  # Apache-2.0
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-oslosphinx>=2.2.0  # Apache-2.0
+requests-mock>=0.6.0 # Apache-2.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+oslosphinx<2.6.0,>=2.5.0 # Apache-2.0
 testrepository>=0.0.18
 testscenarios>=0.4
-testtools>=0.9.36,!=1.2.0
-tempest-lib>=0.3.0
+testtools!=1.2.0,>=0.9.36
+tempest-lib<0.5.0,>=0.4.0