diff options
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | tox.ini | 10 |
2 files changed, 6 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index f503ef7..aeb195e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,5 +5,9 @@ python: - "3.3" - "3.4" - "3.5" -install: "pip install -r requirements.txt" -script: nosetests +install: +- "pip install -r requirements.txt" +- "pip install --upgrade pytest flake8" +script: +- "flake8" +- "py.test" diff --git a/tox.ini b/tox.ini deleted file mode 100644 index a50b8c2..0000000 --- a/tox.ini +++ /dev/null @@ -1,10 +0,0 @@ -[tox] -envlist = py26,py27,py33,py34,pep8 - -[testenv] -deps=pytest -commands=py.test - -[testenv:pep8] -deps = pep8==1.2 -commands = pep8 --repeat --show-source warlock |