Updated from global requirementsjuno-eolstable/juno

Change-Id: I528a137fdeda7bb6f2307bad8fbe59edd33013b4

3 files changed, 21 insertions, 22 deletions

diff --git a/requirements.txt b/requirements.txt
index 8dcffe7..7516935 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,22 +2,22 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-stevedore>=1.0.0,<=1.3.0 # Apache-2.0
-netaddr>=0.7.12,<=0.7.13
+stevedore<=1.3.0,>=1.0.0 # Apache-2.0
+netaddr<=0.7.13,>=0.7.12
 
 # for timeutils
-iso8601>=0.1.9,<=0.1.10
+iso8601<=0.1.10,>=0.1.9
 
 # for jsonutils
-six>=1.7.0,<=1.9.0
+six<=1.9.0,>=1.7.0
 
-oslo.i18n>=1.0.0,<=1.3.1 # Apache-2.0
-oslo.utils>=1.4.0,<1.5.0 # Apache-2.0
-Babel>=1.3,<=1.3
+oslo.i18n<=1.3.1,>=1.3.0 # Apache-2.0
+oslo.utils<1.5.0,>=1.4.0 # Apache-2.0
+Babel<=1.3,>=1.3
 
 # for the routing notifier
-PyYAML>=3.1.0,<=3.10
+PyYAML<=3.10,>=3.1.0
 
 suds==0.4
-eventlet>=0.15.1,<=0.15.2
-requests>=2.1.0,!=2.4.0,<=2.2.1
+eventlet<=0.15.2,>=0.15.1
+requests!=2.4.0,<=2.2.1,>=2.1.0
diff --git a/setup.py b/setup.py
index 7363757..056c16c 100755..100644
--- a/setup.py
+++ b/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");
diff --git a/test-requirements.txt b/test-requirements.txt
index ec0b424..d701811 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,23 +3,23 @@
 # process, which may cause wedges in the gate later.
 
 # Hacking already pins down pep8, pyflakes and flake8
-hacking>=0.9.2,<0.10
+hacking<0.10,>=0.9.2
 pylint==0.25.2
 
 discover<=0.4.0
-fixtures>=0.3.14,<=1.0.0
-mock>=1.0,<=1.0.1
-mox3>=0.7.0,<=0.7.0
-python-subunit>=0.0.18,<=1.0.0
-testrepository>=0.0.18,<=0.0.20
-testscenarios>=0.4,<=0.4
-testtools>=0.9.34,!=1.4.0,<=1.5.0
+fixtures<=1.0.0,>=0.3.14
+mock<=1.0.1,>=1.0
+mox3<=0.7.0,>=0.7.0
+python-subunit<=1.0.0,>=0.0.18
+testrepository<=0.0.20,>=0.0.18
+testscenarios<=0.4,>=0.4
+testtools!=1.4.0,<=1.5.0,>=0.9.34
 
 # when we can require tox>= 1.4, this can go into tox.ini:
 #  [testenv:cover]
 #  deps = {[testenv]deps} coverage
-coverage>=3.6,<=3.7.1
+coverage<=3.7.1,>=3.6
 
 # this is required for the docs build jobs
-oslosphinx>=2.2.0,<2.5.0  # Apache-2.0
-sphinx>=1.1.2,!=1.2.0,<1.3
+oslosphinx<2.5.0,>=2.2.0 # Apache-2.0
+sphinx!=1.2.0,<1.3,>=1.1.2