[lxc-devel] [nova-lxd/master] Move test-requirements to tox.ini

[zulcss on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 416 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20160419/be8e5a8c/attachment.bin>
-------------- next part --------------
From 2e2cb6f526e03f148df84e9d3319d03096a3ae78 Mon Sep 17 00:00:00 2001
From: Chuck Short <chuck.short at canonical.com>
Date: Tue, 19 Apr 2016 14:02:22 -0400
Subject: [PATCH] Move test-requirements to tox.ini

It was preventing devstack from installing correctly.

Signed-off-by: Chuck Short <chuck.short at canonical.com>
---
 test-requirements.txt | 2 --
 tox.ini               | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 78996ac..c411121 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -16,5 +16,3 @@ testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT
 os-testr>=0.4.1 # Apache-2.0
 nosexcover # BSD
--e git+https://github.com/lxc/pylxd#egg=pylxd
--e git+https://github.com/openstack/nova#egg=nova
diff --git a/tox.ini b/tox.ini
index d899b67..b412b99 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,6 +14,8 @@ setenv =
    PYTHONDONTWRITEBYTECODE=1
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
+       -egit+https://github.com/lxc/pylxd#egg=pylxd
+       -egit+https://github.com/openstack/nova#egg=nova
 commands = ostestr {posargs}
 
 [testenv:pep8]