From 264ee2224fdcd4e4dfef76007b35646a53c9b286 Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Sat, 17 Oct 2015 02:55:30 +0000
Subject: [PATCH] Updated from global requirements

Change-Id: Ic1dbd51b9b406e6b0f92093b04ae7faa739a426c
---
 requirements.txt | 10 +++++-----
 setup.py         |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 9ed0e4a7..769b51fe 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,12 +2,12 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr>=1.6,<2.0
+pbr>=1.6
 # Horizon Core Requirements
 Babel>=1.3
-Django>=1.7,<1.9
-django_compressor>=1.4
-django_openstack_auth>=1.4.0
+Django<1.9,>=1.7
+django-compressor>=1.4
+django-openstack-auth>=2.0.0
 iso8601>=0.1.9
-python-keystoneclient>=1.6.0
+python-keystoneclient!=1.8.0,>=1.6.0
 python-manilaclient>=1.3.0
diff --git a/setup.py b/setup.py
index 73637574..782bb21f 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");
@@ -26,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=1.8'],
     pbr=True)