From ea58d8963eeee7f65d89ae7e6f93094a22dc1fe8 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Wed, 29 May 2013 12:23:21 +0200
Subject: [PATCH] Merge with OpenStack requirements

This unifies the pip/test-requires with the common requirements
defined in the OpenStack/requirements repository, which simplifies
dependency tracking for packaging purposes. There are small
minimum-required version bumps that most likely make sense for
horizon as well (or are already implicitely required due to transitive
dependencies).

Change-Id: I50d7d72b54a95012eb7a4f350ef0c3ef88047e01
---
 requirements.txt      | 17 ++++++++---------
 test-requirements.txt | 15 +++++++--------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 87e459b665..6c284207ab 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,20 +1,19 @@
 d2to1>=0.2.10,<0.3
-pbr>=0.5,<0.6
-
+pbr>=0.5.16,<0.6
 # Horizon Core Requirements
-Django>=1.4,<1.6
+django>=1.4,<1.6
 django_compressor>=1.3
-django_openstack_auth>=1.0.8
+django_openstack_auth>=1.0.11
 iso8601>=0.1.4
 netaddr
-python-cinderclient>=1.0.2,<2.0.0
-python-glanceclient<2
+python-cinderclient>=1.0.4,<2
+python-glanceclient>=0.9.0,<2
 python-heatclient>=0.2.2
 python-keystoneclient>=0.2,<0.3
 python-novaclient>=2.12.0,<3
 python-quantumclient>=2.2.0,<3.0.0
-python-swiftclient>1.1,<2
+python-swiftclient>=1.2,<2
 pytz
-
 # Horizon Utility Requirements
-lockfile # for SECURE_KEY generation
+# for SECURE_KEY generation
+lockfile>=0.8
diff --git a/test-requirements.txt b/test-requirements.txt
index 047f3ca866..0e0c1dfe81 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,18 +3,17 @@ pep8==1.4.5
 pyflakes==0.7.2
 flake8==2.0
 hacking>=0.5.3,<0.6
-
 # Testing Requirements
-coverage
+coverage>=3.6
 django-nose
-mox
+mox>=0.5.3
 nose
 nose-exclude
 nosexcover
-openstack.nose_plugin
-nosehtmloutput
+openstack.nose_plugin>=0.7
+nosehtmloutput>=0.0.3
 selenium
-
 # Docs Requirements
-sphinx
-docutils==0.9.1 # for bug 1091333, remove after sphinx >1.1.3 is released.
+sphinx>=1.1.2
+# for bug 1091333, remove after sphinx >1.1.3 is released.
+docutils==0.9.1