diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-12-27 12:20:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-27 12:20:12 -0500 |
| commit | 18107aeee0644bf7e8f8750efa63cb64153d3a85 (patch) | |
| tree | dc3981641e83fd06d9bb3ddd92518cf699a2047a /.travis.yml | |
| parent | 9f8efb28f903f3abe4764c485356c83e41adfa66 (diff) | |
| parent | 91ecacb76d14e2531fe5ed46cfc02f751960863e (diff) | |
| download | cherrypy-git-18107aeee0644bf7e8f8750efa63cb64153d3a85.tar.gz | |
Merge branch 'master' into issue-1538
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index acc12d5f..d3395934 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,10 +17,10 @@ matrix: - python: pypy # TODO: fix tests - python: pypy3 - - env: TOXENV=linter + - env: TOXENV=pre-commit include: - python: 3.5 - env: TOXENV=linter + env: TOXENV=pre-commit include: - python: 3.5 env: TOXENV=dist-check |