diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-10-04 18:05:15 -0700 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-10-04 18:05:15 -0700 |
| commit | ad94012f3091bb2809d79d4bf3c705e2e71c3b52 (patch) | |
| tree | 4d1284c7c2dba3900e6943238b5e89ab2a8cf72c /.travis.yml | |
| parent | 6ffd4e1322da9853307b770216f37c764750d6f7 (diff) | |
| parent | 5a6be439059d7c5b07f79f08a83a0c4b6d715984 (diff) | |
| download | cherrypy-git-ad94012f3091bb2809d79d4bf3c705e2e71c3b52.tar.gz | |
Merge with master
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index bb647abf..2c567857 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,31 +2,41 @@ language: python python: - 2.6 - 2.7 -- 3.1 - 3.2 - 3.3 - 3.4 - 3.5 +- 3.5-dev - pypy - pypy3 - nightly + matrix: + fast_finish: true allow_failures: - - python: 3.1 + # TODO: check what causes testing stuck - python: pypy + # TODO: fix tests - python: pypy3 - - python: nightly + - python: 3.5 + env: RUN_LINTS=true + include: + - python: 3.5 + env: RUN_LINTS=true + +cache: pip env: - WEBTEST_INTERACTIVE=false -script: python setup.py test +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' +script: 'if [ "$RUN_LINTS" = "true" ]; then pre-commit run --all-files; else python setup.py test; fi' deploy: provider: pypi on: tags: true - all_branches: true python: 3.5 user: jaraco password: |