Updated from global requirementsjuno-eolstable/juno

Change-Id: Iaef11252b6980661057a36d010f0228348d44254

3 files changed, 14 insertions, 15 deletions

diff --git a/requirements.txt b/requirements.txt
index 34a0874..1503ecb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,6 +3,6 @@
 # process, which may cause wedges in the gate later.
 
 argparse
-netaddr>=0.7.12,<=0.7.13
-six>=1.7.0,<=1.9.0
-stevedore>=1.0.0,<=1.3.0 # Apache-2.0
+netaddr<=0.7.13,>=0.7.12
+six<=1.9.0,>=1.7.0
+stevedore<=1.3.0,>=1.0.0 # Apache-2.0
diff --git a/setup.py b/setup.py
index 7363757..056c16c 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 19eeefe..126b416 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,24 +2,24 @@
 # 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
 
 discover<=0.4.0
-fixtures>=0.3.14,<=1.0.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
-oslotest>=1.1.0,<1.4.0  # Apache-2.0
+fixtures<=1.0.0,>=0.3.14
+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
+oslotest<1.4.0,>=1.1.0 # Apache-2.0
 
 # 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
-sphinx>=1.1.2,!=1.2.0,<1.3
-oslosphinx>=2.2.0,<2.5.0  # Apache-2.0
+sphinx!=1.2.0,<1.3,>=1.1.2
+oslosphinx<2.5.0,>=2.2.0 # Apache-2.0
 
 # mocking framework
-mock>=1.0,<=1.0.1
+mock<=1.0.1,>=1.0