summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2016-02-07 16:34:46 -0500
committerChris McDonough <chrism@plope.com>2016-02-07 16:34:46 -0500
commitdf7a123a847e2243f38688c033f06200382ba139 (patch)
treecc8e032c2a85d9fee45e68f7f3501046c8bec8ed /.travis.yml
parent5cd91621668807f9b66811fe57a04fba96e7458a (diff)
parented04017d5a8e82db2e46412f841c55d83ef062b0 (diff)
downloadpyramid-df7a123a847e2243f38688c033f06200382ba139.tar.gz
pyramid-df7a123a847e2243f38688c033f06200382ba139.tar.bz2
pyramid-df7a123a847e2243f38688c033f06200382ba139.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml7
1 files changed, 5 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 79d9fa09d..39f0ca435 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,6 @@ matrix:
env: TOXENV=py26
- python: 2.7
env: TOXENV=py27
- - python: 3.2
- env: TOXENV=py32
- python: 3.3
env: TOXENV=py33
- python: 3.4
@@ -23,6 +21,8 @@ matrix:
- python: 3.5
env: TOXENV=py2-cover,py3-cover,coverage
- python: 3.5
+ env: TOXENV=docs
+ - python: 3.5
env: TOXENV=pep8
install:
@@ -34,3 +34,6 @@ script:
notifications:
email:
- pyramid-checkins@lists.repoze.org
+ irc:
+ channels:
+ - "chat.freenode.net#pyramid"