From 7e2452e5438fe05c64bafab89deb7b3b5b414004 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Mon, 13 Aug 2018 16:32:24 -0400 Subject: [PATCH] add proper pydot3 dependency Move the dependency out of tox.ini and into requirements.txt where it can be managed properly. Depends-On: https://review.openstack.org/590103 Change-Id: Ic69a4c5beb1aed2e49d2f767cb46c324fe0df0f5 Signed-off-by: Doug Hellmann --- lower-constraints.txt | 1 + requirements.txt | 3 +++ tox.ini | 12 ------------ 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index fe122dffe..bddc7c4de 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -48,6 +48,7 @@ pbr==2.0.0 pep8==1.5.7 prettytable==0.7.2 psycopg2==2.6.2 +pydot==1.2.4 pydotplus==2.0.2 pyflakes==0.8.1 Pygments==2.2.0 diff --git a/requirements.txt b/requirements.txt index fc704f34b..53fc393ab 100644 --- a/requirements.txt +++ b/requirements.txt @@ -50,3 +50,6 @@ debtcollector>=1.2.0 # Apache-2.0 # For stestr stestr>=2.0.0 # Apache-2.0 + +# For pydot output tests +pydot>=1.2.4 # MIT License diff --git a/tox.ini b/tox.ini index 5696d9d65..636733590 100644 --- a/tox.ini +++ b/tox.ini @@ -87,18 +87,6 @@ import_exceptions = # end-string." ignore-path = doc/*/target,doc/*/build* -[testenv:py27] -deps = - {[testenv]deps} - pydot -basepython = python2.7 - -[testenv:py35] -deps = - {[testenv]deps} - pydot -basepython = python3.5 - [testenv:releasenotes] basepython = python3 deps = -r{toxinidir}/doc/requirements.txt