sync with global-requirementsjuno-eol1.3.1stable/juno

- update .gitreview
- run an update ftom the openstack/requiremnets repo

Change-Id: I01423a5012fa8bb415d9e7a0aa5c921c7451f6e3

4 files changed, 15 insertions, 15 deletions

diff --git a/.gitreview b/.gitreview
index b65ed63..c6939f8 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.openstack.org
 port=29418
 project=openstack/oslotest.git
+defaultbranch=stable/juno
diff --git a/requirements.txt b/requirements.txt
index 125b54e..0672e29 100644
--- a/requirements.txt
+++ b/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.
 
-pbr>=0.6,!=0.7,<1.0
-discover
-fixtures>=0.3.14
-python-subunit>=0.0.18
-six>=1.7.0
-testrepository>=0.0.18
-testscenarios>=0.4
-testtools>=0.9.36,!=1.2.0
-mock>=1.0
-mox3>=0.7.0
+pbr!=0.7,<1.0,>=0.6
+discover<=0.4.0
+fixtures<=1.0.0,>=0.3.14
+python-subunit<=1.0.0,>=0.0.18
+six<=1.9.0,>=1.7.0
+testrepository<=0.0.20,>=0.0.18
+testscenarios<=0.4,>=0.4
+testtools!=1.4.0,<=1.5.0,>=0.9.34
+mock<=1.0.1,>=1.0
+mox3<=0.7.0,>=0.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 5a845ba..1c9dbdc 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>=0.9.2,<0.10
+hacking<0.10,>=0.9.2
 
 # when we can require tox>= 1.4, this can go into tox.ini:
 #  [testenv:cover]
 #  deps = {[testenv]deps} coverage
-coverage>=3.6
+coverage<=3.7.1,>=3.6
 
 # this is required for the docs build jobs
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-oslosphinx>=2.2.0  # Apache-2.0
+sphinx!=1.2.0,<1.3,>=1.1.2
+oslosphinx<2.5.0,>=2.2.0 # Apache-2.0