From f5a7afab7e70ae6736c4c3c6abb53f70b2b45a64 Mon Sep 17 00:00:00 2001 From: Michael Hwang Date: Mon, 25 Sep 2017 12:13:10 -0400 Subject: Toxify for docker and relationship Issue-Id: DCAEGEN2-60 Change-Id: Idaacf7239a54a21d45d77731cae13e5115b68f02 Signed-off-by: Michael Hwang --- relationships/requirements.txt | 2 -- relationships/setup.py | 3 +-- relationships/tox.ini | 21 ++++++--------------- 3 files changed, 7 insertions(+), 19 deletions(-) (limited to 'relationships') diff --git a/relationships/requirements.txt b/relationships/requirements.txt index 59c8c70..af1659c 100644 --- a/relationships/requirements.txt +++ b/relationships/requirements.txt @@ -1,6 +1,4 @@ bottle==0.12.7 -cloudify-plugins-common==3.4 -cloudify-rest-client==3.4 Jinja2==2.7.2 MarkupSafe==0.23 networkx==1.8.1 diff --git a/relationships/setup.py b/relationships/setup.py index fbbf077..e576d3c 100644 --- a/relationships/setup.py +++ b/relationships/setup.py @@ -29,7 +29,6 @@ setup( packages=['relationshipplugin'], zip_safe=False, install_requires=[ - "python-consul>=0.6.0", - "cloudify-plugins-common==3.4.0" + "python-consul>=0.6.0" ] ) diff --git a/relationships/tox.ini b/relationships/tox.ini index 2e31087..5d8f4ae 100644 --- a/relationships/tox.ini +++ b/relationships/tox.ini @@ -1,20 +1,11 @@ +# content of: tox.ini , put in same dir as setup.py [tox] envlist = py27 + [testenv] deps= - pytest - uuid==1.30 - cloudify==3.4 - bottle==0.12.7 cloudify-plugins-common==3.4 - cloudify-rest-client==3.4 - Jinja2==2.7.2 - MarkupSafe==0.23 - networkx==1.8.1 - pika==0.9.14 - proxy-tools==0.1.0 - python-consul==0.6.1 - requests==2.7.0 - requests-toolbelt==0.7.0 - six==1.10.0 -commands=pytest + pytest + coverage + pytest-cov +commands=pytest --junitxml xunit-results.xml --cov {envsitepackagesdir}/relationshipplugin --cov-report=xml -- cgit 1.2.3-korg