diff options
author | Lusheng Ji <lji@research.att.com> | 2017-09-25 17:31:26 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2017-09-25 17:31:26 +0000 |
commit | d38e228959de388f0ed6d1876e8392e18f17006a (patch) | |
tree | 119dc113e14bc39c0a82d191d77fd69cb82bb46e /relationships | |
parent | 56e8ff3b33cb4f0a7003871531cecc617651fff2 (diff) | |
parent | f5a7afab7e70ae6736c4c3c6abb53f70b2b45a64 (diff) |
Merge "Toxify for docker and relationship"
Diffstat (limited to 'relationships')
-rw-r--r-- | relationships/requirements.txt | 2 | ||||
-rw-r--r-- | relationships/setup.py | 3 | ||||
-rw-r--r-- | relationships/tox.ini | 21 |
3 files changed, 7 insertions, 19 deletions
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 |