From b10e8938f9d2df28b1194499265660ccb90d3d51 Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Mon, 22 Jun 2015 08:27:41 +0000
Subject: [PATCH] Updated from global requirements

Change-Id: I19b9915bedacec60fc584a7437a9b46a80a26bdc
---
 requirements.txt      | 10 +++++-----
 setup.py              |  1 -
 test-requirements.txt | 10 +++++-----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 86b7ca6b..cdc8c895 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,14 +1,14 @@
 # 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.11,<2.0
+pbr<2.0,>=0.11
 Babel>=1.3
 argparse
-PrettyTable>=0.7,<0.8
+PrettyTable<0.8,>=0.7
 python-keystoneclient>=1.6.0
 pyOpenSSL>=0.11
 requests>=2.5.2
-warlock>=1.0.1,<2
+warlock<2,>=1.0.1
 six>=1.9.0
-oslo.utils>=1.6.0                       # Apache-2.0
-oslo.i18n>=1.5.0  # Apache-2.0
+oslo.utils>=1.6.0 # Apache-2.0
+oslo.i18n>=1.5.0 # Apache-2.0
diff --git a/setup.py b/setup.py
index 73637574..056c16c2 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 8b296b9d..92f31ef7 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,16 +1,16 @@
 # 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.10.0,<0.11
+hacking<0.11,>=0.10.0
 
 coverage>=3.6
 discover
 mock>=1.0
-oslosphinx>=2.5.0  # Apache-2.0
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+oslosphinx>=2.5.0 # Apache-2.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 testrepository>=0.0.18
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0
 testscenarios>=0.4
 fixtures>=0.3.14
-requests-mock>=0.6.0  # Apache-2.0
+requests-mock>=0.6.0 # Apache-2.0
 tempest-lib>=0.5.0