summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorTres Seaver <tseaver@palladion.com>2012-06-24 10:35:49 -0400
committerTres Seaver <tseaver@palladion.com>2012-06-24 10:35:49 -0400
commita0e59d530726ab3f67b1c389cf8baecc13309ed6 (patch)
tree5d0614c2cd6a83e7381146f099faa7cb31d80c16 /.travis.yml
parent5f8493cbfd9dac153f7442f1cffc117f85280716 (diff)
downloadpyramid-a0e59d530726ab3f67b1c389cf8baecc13309ed6.tar.gz
pyramid-a0e59d530726ab3f67b1c389cf8baecc13309ed6.tar.bz2
pyramid-a0e59d530726ab3f67b1c389cf8baecc13309ed6.zip
Un-comment the PyPy 'allow_failures' bit.
We need an explanation for why the PyPy tests fail under travis-ci.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml8
1 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 665d15384..c637dc215 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,10 @@ python:
- pypy
- 3.2
-#matrix:
-# allow_failures:
-# - python: pypy
+# 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