diff --git a/Makefile b/Makefile index e997a526..8cf2eab3 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,8 @@ # Dummy target `all` all: -# Note --aplication-import-names only works on Python3 - -test: lint - PYTHONPATH=src trial cowrie +test: + tox build: python setup.py build sdist bdist @@ -15,7 +13,7 @@ docs: make -C docs html lint: - flake8 --count --application-import-names cowrie --max-line-length=120 --statistics --exclude=cowrie-env . + tox -e lint clean: rm -rf _trial_temp build dist diff --git a/tox.ini b/tox.ini index e7716abe..b9ecc8fb 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,17 @@ [tox] skipsdist = True -envlist = lint,py27,py37,docs +envlist = lint,py27,py34,py35,py36,py37,py38,docs deps = -r{toxinidir}/requirements.txt +[travis] +python = + 2.7: py27 + 3.4: py34 + 3.5: py35 + 3.6: py36 + 3.7: py37, lint, docs + 3.8-dev: py38 + [testenv] setenv = PYTHONPATH = {toxinidir}/src @@ -12,13 +21,11 @@ commands = trial cowrie [testenv:lint] -setenv = - PYTHONPATH = {toxinidir}/src deps = -r{toxinidir}/requirements.txt -r{toxinidir}/requirements-dev.txt commands = - flake8 --count --application-import-names cowrie --max-line-length=120 --statistics . + flake8 --count --application-import-names cowrie --max-line-length=120 --statistics {toxinidir}/src [testenv:docs] setenv =