From 5ee077976e4bf982517dc43c47e8e10b7fd50e4a Mon Sep 17 00:00:00 2001 From: "Ivan A. Melnikov" Date: Tue, 4 Feb 2014 13:14:14 +0400 Subject: [PATCH] Move kazoo to testenv requirements Kazoo is an optional dependency of taskflow: it is required when zookeeper persistence layer or if kazoo_utils are used. So we should move it to where these type of optional requirements are currently placed. Change-Id: I9d1605af266f4a79fd6ebfee2d68a4f4f7413022 --- test-requirements.txt | 2 -- tox-tmpl.ini | 1 + tox.ini | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index c39d711f..df69946d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,6 +5,4 @@ mock>=1.0 python-subunit>=0.0.18 testrepository>=0.0.17 testtools>=0.9.34 -# ZooKeeper -kazoo>=1.3.1 zake>=0.0.13 diff --git a/tox-tmpl.ini b/tox-tmpl.ini index 947b9402..1ad399a6 100644 --- a/tox-tmpl.ini +++ b/tox-tmpl.ini @@ -17,6 +17,7 @@ deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt alembic>=0.4.1 psycopg2 + kazoo>=1.3.1 commands = python setup.py testr --slowest --testr-args='{posargs}' [tox:jenkins] diff --git a/tox.ini b/tox.ini index 04e62a5b..13bbf71f 100644 --- a/tox.ini +++ b/tox.ini @@ -48,6 +48,7 @@ deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt alembic>=0.4.1 psycopg2 + kazoo>=1.3.1 commands = python setup.py testr --slowest --testr-args='{posargs}' [tox:jenkins]