Updated from global requirementsjuno-eol1.4.2stable/juno

Change-Id: If72fa923d4e937a9ace1f2744e7fe3903cdd00db

5 files changed, 40 insertions, 41 deletions

diff --git a/requirements-py3.txt b/requirements-py3.txt
index ad7b5aa..4a2961e 100644
--- a/requirements-py3.txt
+++ b/requirements-py3.txt
@@ -1,21 +1,21 @@
 # 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.
-oslo.config>=1.4.0,<=1.6.0 # Apache-2.0
-oslo.utils>=1.4.0,<1.5.0 # Apache-2.0
-stevedore>=1.0.0,<=1.3.0 # Apache-2.0
+oslo.config<=1.6.0,>=1.4.0 # Apache-2.0
+oslo.utils<1.5.0,>=1.4.0 # Apache-2.0
+stevedore<=1.3.0,>=1.0.0 # Apache-2.0
 
 # for jsonutils
-six>=1.7.0,<=1.9.0
+six<=1.9.0,>=1.7.0
 
 # used by openstack/common/gettextutils.py
-Babel>=1.3,<=1.3
+Babel<=1.3,>=1.3
 
 # for the routing notifier
-PyYAML>=3.1.0,<=3.10
+PyYAML<=3.10,>=3.1.0
 
 # rabbit driver is the default
-kombu>=2.5.0,<=3.0.7
+kombu<=3.0.15,>=2.5.0
 
 # middleware
-WebOb>=1.2.3,<=1.3.1
+WebOb<=1.3.1,>=1.2.3
diff --git a/requirements.txt b/requirements.txt
index a2c88e1..70cd784 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,23 +1,23 @@
 # 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.
-oslo.config>=1.4.0,<=1.6.0 # Apache-2.0
-oslo.utils>=1.4.0,<1.5.0 # Apache-2.0
-stevedore>=1.0.0,<=1.3.0 # Apache-2.0
+oslo.config<=1.6.0,>=1.4.0 # Apache-2.0
+oslo.utils<1.5.0,>=1.4.0 # Apache-2.0
+stevedore<=1.3.0,>=1.0.0 # Apache-2.0
 
 # for jsonutils
-six>=1.7.0,<=1.9.0
+six<=1.9.0,>=1.7.0
 
 # FIXME(markmc): remove this when the drivers no longer
 # import eventlet
 
-eventlet>=0.15.1,<=0.15.2
+eventlet<=0.15.2,>=0.15.1
 
 # used by openstack/common/gettextutils.py
-Babel>=1.3,<=1.3
+Babel<=1.3,>=1.3
 
 # for the routing notifier
-PyYAML>=3.1.0,<=3.10
+PyYAML<=3.10,>=3.1.0
 
 # rabbit driver is the default
-kombu>=2.5.0,<=3.0.7
+kombu<=3.0.15,>=2.5.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-py3.txt b/test-requirements-py3.txt
index c182aa1..1e122f7 100644
--- a/test-requirements-py3.txt
+++ b/test-requirements-py3.txt
@@ -2,23 +2,23 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 # Hacking already pins down pep8, pyflakes and flake8
-hacking>=0.9.1,<0.10
+hacking<0.10,>=0.9.1
 
 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
-oslotest>=1.1.0,<1.4.0  # Apache-2.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
+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
diff --git a/test-requirements.txt b/test-requirements.txt
index 7400104..4a732d3 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,17 +2,17 @@
 # of appearance. Changing the order has an impact on the overall integration
 # 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
 
 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
-oslotest>=1.1.0,<1.4.0  # Apache-2.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
+oslotest<1.4.0,>=1.1.0 # Apache-2.0
 
 # for test_qpid
 qpid-python<=0.26.1
@@ -20,8 +20,8 @@ qpid-python<=0.26.1
 # 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