summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-10-08 17:34:43 -0400
committerChris McDonough <chrism@plope.com>2012-10-08 17:34:43 -0400
commit2aed2c783a99efaa48b145d174347c9512e40c5a (patch)
tree11ab8f12072353e7e324e66bda5914c78cd5c1ea /.travis.yml
parenta9f5e705bb331098946eef774857511a02e4f498 (diff)
parent1273d56ee5c038f447dce0525844cd3ea6c15e4d (diff)
downloadpyramid-2aed2c783a99efaa48b145d174347c9512e40c5a.tar.gz
pyramid-2aed2c783a99efaa48b145d174347c9512e40c5a.tar.bz2
pyramid-2aed2c783a99efaa48b145d174347c9512e40c5a.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 0 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 490fd2df7..ab9c3ff30 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,12 +6,6 @@ python:
- pypy
- 3.2
-# Why does travis-ci's PyPy blow up? Pyramid's tests
-# run fine under tox.
-matrix:
- allow_failures:
- - python: pypy
-
script: python setup.py test
notifications: