summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-12-23 17:26:28 -0500
committerJason R. Coombs <jaraco@jaraco.com>2016-12-23 17:26:28 -0500
commitac9e5a0fc923eb538a5b31029764657eb4505785 (patch)
tree62015d6277e36696c74ed51338385ae7f93fbc3c /.travis.yml
parent1952b081740fb61b29dd4ae949ac15e1488439d8 (diff)
downloadcherrypy-git-ac9e5a0fc923eb538a5b31029764657eb4505785.tar.gz
Use tox for launching the linter. Now the linter can be run with tox -e linter. Makes the travis script much cleaner.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml11
1 files changed, 4 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 436b8309..7542c869 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,18 +17,15 @@ matrix:
- python: pypy
# TODO: fix tests
- python: pypy3
- - env: RUN_LINTS=true
+ - env: TOX_ENV=linter
include:
- python: 3.5
- env: RUN_LINTS=true
+ env: TOX_ENV=linter
cache: pip
-before_install: 'if [ "$RUN_LINTS" = "true" ]; then pip install pre-commit; fi'
-install:
-- 'if [ "$RUN_LINTS" != "true" ]; then pip install -e .[test_tools,routes_dispatcher]; fi'
-- pip install tox
-script: 'if [ "$RUN_LINTS" = "true" ]; then pre-commit run --all-files; else tox; fi'
+install: pip install tox
+script: tox
deploy:
provider: pypi