[lxc-devel] [nova-lxd/stable/mitaka] Fix stable/mitaka branch tests for tox

[rockstar on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 305 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20160512/50706efe/attachment.bin>
-------------- next part --------------
From 3e0966feb01efb128310abc343660e921fb35e61 Mon Sep 17 00:00:00 2001
From: Paul Hummer <paul.hummer at canonical.com>
Date: Thu, 12 May 2016 09:45:58 -0600
Subject: [PATCH] Fix stable/mitaka branch tests for tox

---
 requirements.txt      | 1 +
 test-requirements.txt | 2 --
 tox.ini               | 3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 8d88392..eeebe80 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,6 +5,7 @@
 pbr>=1.6 # Apache-2.0
 Babel>=1.3 # BSD
 requests!=2.9.0,>=2.8.1 # Apache-2.0
+pylxd==2.0.0
 oslo.config>=3.4.0 # Apache-2.0
 oslo.concurrency>=2.3.0 # Apache-2.0
 oslo.utils>=3.4.0 # Apache-2.0
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..2b8b66f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 minversion = 1.6
 # Python 3 tests MUST run first, due to this bug:
 # https://bugs.launchpad.net/testrepository/+bug/1229445
-envlist = py34,py27,pep8
+envlist = py3,py27,pep8
 skipsdist = True
 
 [testenv]
@@ -14,6 +14,7 @@ setenv =
    PYTHONDONTWRITEBYTECODE=1
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
+       -egit+https://github.com/openstack/nova.git@stable/mitaka#egg=nova
 commands = ostestr {posargs}
 
 [testenv:pep8]