From 4d35cc6f2878f8320e665d7414d6e5205860a528 Mon Sep 17 00:00:00 2001 From: Emmanuelle Vargas-Gonzalez Date: Fri, 6 Apr 2018 14:25:06 -0400 Subject: [PATCH] WIP: Update tox.ini --- tox.ini | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/tox.ini b/tox.ini index bfc8c1b..884288a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,15 +1,15 @@ [tox] -envlist = py27,py34,py35,py36,pycodestyle,isort-check +envlist = py27,py34,py35,py36,pycodestyle,isort-check,taxii-datastore [testenv] deps = - -U - tox - pytest - pytest-cov - coverage + -U + tox + pytest + pytest-cov + coverage commands = - py.test --cov=stix2 stix2/test/ --cov-report term-missing + py.test --cov=stix2 stix2/test/ --cov-report term-missing passenv = CI TRAVIS TRAVIS_* @@ -22,20 +22,28 @@ commands = flake8 [pycodestyle] -max-line-length=160 +max-line-length = 160 [flake8] -max-line-length=160 +max-line-length = 160 [testenv:isort-check] deps = isort commands = - isort -rc stix2 examples -df - isort -rc stix2 examples -c + isort -rc stix2 examples -df + isort -rc stix2 examples -c + +[testenv:taxii-datastore] +deps = + git+https://github.com/oasis-open/cti-taxii-client.git#egg=taxii2-client + git+https://github.com/oasis-open/cti-taxii-server.git#egg=medallion + +commands = + py.test --cov=stix2 stix2/test/test_datastore_taxii.py --cov-report term-missing [travis] python = - 2.7: py27, pycodestyle + 2.7: py27, pycodestyle, taxii-datastore 3.4: py34, pycodestyle 3.5: py35, pycodestyle - 3.6: py36, pycodestyle + 3.6: py36, pycodestyle, taxii-datastore