diff options
| author | Brian Waldon <brian@waldon.cc> | 2016-06-25 10:59:48 -0700 |
|---|---|---|
| committer | Brian Waldon <brian@waldon.cc> | 2016-06-25 10:59:48 -0700 |
| commit | b7b22e5972efde8ea32990f6853dd7d6db05f11f (patch) | |
| tree | 6cd76624b5178a605f05d535e273ecbf12f1a1ed | |
| parent | 64a771d151a5defb9bca82042f2c78d513b33aa9 (diff) | |
| download | warlock-b7b22e5972efde8ea32990f6853dd7d6db05f11f.tar.gz | |
Use py.test and flake8 in Travis CI
| -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 |