Updated from global requirementsjuno-eol1.0.15stable/juno

Change-Id: Iee95922e66b4885f720499d912ff1926019b67c9

3 files changed, 17 insertions, 18 deletions

diff --git a/requirements.txt b/requirements.txt
index 1692306..336c0ba 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,11 @@
 # 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
-iso8601>=0.1.9
-oslo.utils>=1.0.0                       # Apache-2.0
-PrettyTable>=0.7,<0.8
-python-keystoneclient>=0.10.0
-six>=1.7.0
-stevedore>=0.14
+iso8601<=0.1.10,>=0.1.9
+oslo.utils<1.5.0,>=1.4.0 # Apache-2.0
+PrettyTable<0.8,>=0.7
+python-keystoneclient<1.2.0,>=0.10.0
+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 1bdbb36..0807ae1 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,13 +2,13 @@
 # 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
-coverage>=3.6
-discover
-fixtures>=0.3.14
-mock>=1.0
-oslosphinx>=2.2.0.0a2
-python-subunit>=0.0.18
-sphinx>=1.1.2,!=1.2.0,<1.3
-testrepository>=0.0.18
-testtools>=0.9.34
+hacking<0.10,>=0.9.1
+coverage<=3.7.1,>=3.6
+discover<=0.4.0
+fixtures<=1.0.0,>=0.3.14
+mock<=1.0.1,>=1.0
+oslosphinx<2.5.0,>=2.2.0 # Apache-2.0
+python-subunit<=1.0.0,>=0.0.18
+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