Updated from global requirements

Change-Id: I084046b28bf46a6c11948f3fb3f69bc99b5df9e8

requirements.txt

@@ -1,16 +1,16 @@
 # 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
-cliff>=1.7.0,<=1.9.0 # Apache-2.0
-iso8601>=0.1.9,<=0.1.10
-netaddr>=0.7.12,<=0.7.13
-oslo.i18n>=1.0.0,<=1.3.1 # Apache-2.0
-oslo.serialization>=1.0.0,<=1.2.0 # Apache-2.0
-oslo.utils>=1.4.0,<1.5.0 # Apache-2.0
-requests>=2.1.0,!=2.4.0,<=2.2.1
-python-keystoneclient>=0.10.0,<1.2.0
-simplejson>=2.2.0,<=3.3.1
-six>=1.7.0,<=1.9.0
-Babel>=1.3,<=1.3
+cliff<=1.9.0,>=1.7.0 # Apache-2.0
+iso8601<=0.1.10,>=0.1.9
+netaddr<=0.7.13,>=0.7.12
+oslo.i18n<=1.3.1,>=1.3.0 # Apache-2.0
+oslo.serialization<=1.2.0,>=1.0.0 # Apache-2.0
+oslo.utils<1.5.0,>=1.4.0 # Apache-2.0
+requests!=2.4.0,<=2.2.1,>=2.1.0
+python-keystoneclient<1.2.0,>=0.10.0
+simplejson<=3.3.1,>=2.2.0
+six<=1.9.0,>=1.7.0
+Babel<=1.3,>=1.3

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.9.2,<0.10
+hacking<0.10,>=0.9.2
 
-cliff-tablib>=1.0,<=1.1
-coverage>=3.6,<=3.7.1
+cliff-tablib<=1.1,>=1.0
+coverage<=3.7.1,>=3.6
 discover<=0.4.0
-fixtures>=0.3.14,<=1.0.0
-mox3>=0.7.0,<=0.7.0
-oslosphinx>=2.2.0,<2.5.0  # Apache-2.0
-oslotest>=1.1.0,<1.4.0  # Apache-2.0
-python-subunit>=0.0.18,<=1.0.0
-requests-mock>=0.4.0  # Apache-2.0
-sphinx>=1.1.2,!=1.2.0,<1.3
-testrepository>=0.0.18,<=0.0.20
-testtools>=0.9.34,!=1.4.0,<=1.5.0
+fixtures<=1.0.0,>=0.3.14
+mox3<=0.7.0,>=0.7.0
+oslosphinx<2.5.0,>=2.2.0 # Apache-2.0
+oslotest<1.4.0,>=1.1.0 # Apache-2.0
+python-subunit<=1.0.0,>=0.0.18
+requests-mock>=0.4.0 # Apache-2.0
+sphinx!=1.2.0,<1.3,>=1.1.2
+testrepository<=0.0.20,>=0.0.18
+testtools!=1.4.0,<=1.5.0,>=0.9.34