summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2017-06-29 08:56:54 -0500
committerGitHub <noreply@github.com>2017-06-29 08:56:54 -0500
commitd8c65478053f2b12a9a7a1abe0b291d51af54653 (patch)
treeceab05571416b62cd47652e97175fa0c1f8f2bc4 /.travis.yml
parent7c5880be8dcdd22b51920d2248055db3f386565e (diff)
parentefb35f1e6ea296499274ed8fc5c2d023f8ed71e6 (diff)
downloadpyramid-d8c65478053f2b12a9a7a1abe0b291d51af54653.tar.gz
pyramid-d8c65478053f2b12a9a7a1abe0b291d51af54653.tar.bz2
pyramid-d8c65478053f2b12a9a7a1abe0b291d51af54653.zip
Merge pull request #3111 from mmerickel/check-manifest
add a manifest and a tox step to check it
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index ffc6caa72..1d4c4eeac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,8 @@ matrix:
env: TOXENV=py34
- python: 3.5
env: TOXENV=py35
+ - python: 3.6
+ env: TOXENV=py36
- python: pypy
env: TOXENV=pypy
- python: 3.5
@@ -17,9 +19,7 @@ matrix:
- python: 3.5
env: TOXENV=docs
- python: 3.5
- env: TOXENV=pep8
- - python: 3.6
- env: TOXENV=py36
+ env: TOXENV=lint
- python: nightly
env: TOXENV=py37
allow_failures: