Updated from global requirementsjuno-eolstable/juno

Change-Id: I47ff5606b5d2fbb96cd8c5aac1d942ecb6fe66b7

3 files changed, 6 insertions, 7 deletions

diff --git a/requirements.txt b/requirements.txt
index e5783aa..027621c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 # 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.
-Babel>=1.3,<=1.3
-six>=1.7.0,<=1.9.0
+Babel<=1.3,>=1.3
+six<=1.9.0,>=1.7.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 949664e..f5300a0 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,9 +1,9 @@
 # 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
 
-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
 
-oslotest>=1.1.0,<1.4.0  # Apache-2.0
+oslotest<1.4.0,>=1.1.0 # Apache-2.0