From 3086ea62b0f572505d8a1a53935578384f589d3a Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Thu, 28 Sep 2017 13:57:12 +0000
Subject: [PATCH] Updated from global requirements

Change-Id: Ib2f62f0d4ecdca22c2f4e515e5d7a914cdd4873f
---
 requirements.txt      | 12 ++++++------
 setup.py              |  2 ++
 test-requirements.txt | 18 +++++++++---------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index ede6d33..80e01a2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,11 +7,11 @@
 # be installed in a specific order.
 #
 # PBR should always appear first
-pbr>=2.0.0,!=2.1.0  # Apache-2.0
-Babel>=2.3.4,!=2.4.0  # BSD
-Django>=1.8,<2.0  # BSD
-django-babel>=0.5.1  # BSD
-django_compressor>=2.0  # MIT
-django_openstack_auth>=3.5.0  # Apache-2.0
+pbr!=2.1.0,>=2.0.0 # Apache-2.0
+Babel!=2.4.0,>=2.3.4 # BSD
+Django<2.0,>=1.8 # BSD
+django-babel>=0.5.1 # BSD
+django-compressor>=2.0 # MIT
+django-openstack-auth>=3.5.0 # Apache-2.0
 django-pyscss>=2.0.2 # BSD License (2 clause)
 http://tarballs.openstack.org/python-blazarclient/python-blazarclient-master.tar.gz#egg=python-blazarclient
diff --git a/setup.py b/setup.py
index d74ff58..566d844 100644
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,5 @@
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
diff --git a/test-requirements.txt b/test-requirements.txt
index 7cee992..d415a62 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,16 +9,16 @@
 # Hacking should appear first in case something else depends on pep8
 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 #
-coverage>=4.0,!=4.4  # Apache-2.0
+coverage!=4.4,>=4.0 # Apache-2.0
 django-nose>=1.4.4 # BSD
-mock>=2.0 # BSD
-mox3>=0.7.0,!=0.19.0  # Apache-2.0
-nodeenv>=0.9.4  # BSD
-nose # LGPL
-nose-exclude # LGPL
+mock>=2.0.0 # BSD
+mox3>=0.20.0 # Apache-2.0
+nodeenv>=0.9.4 # BSD
+nose>=1.3.7 # LGPL
+nose-exclude>=0.3.0 # LGPL
 nosehtmloutput>=0.0.3 # Apache-2.0
-nosexcover # BSD
+nosexcover>=1.0.10 # BSD
 openstack.nose-plugin>=0.7 # Apache-2.0
-reno>=1.8.0,!=2.3.1  # Apache-2.0
-sphinx>=1.6.2  # BSD
+reno>=2.5.0 # Apache-2.0
+sphinx>=1.6.2 # BSD
 testtools>=1.4.0 # MIT