summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-09-15 15:59:20 -0700
committerChris McDonough <chrism@plope.com>2012-09-15 15:59:20 -0700
commit8402b63ff8edf2ae6268108afbdb3180a64c730b (patch)
treef75042c8b99e414eac88ade8f701871acf655e8d /.travis.yml
parent07cb8f0e112642a6a40127232ddc06125a73750e (diff)
parent4c1933f522731e1ae5874275025a8d20b9e63336 (diff)
downloadpyramid-8402b63ff8edf2ae6268108afbdb3180a64c730b.tar.gz
pyramid-8402b63ff8edf2ae6268108afbdb3180a64c730b.tar.bz2
pyramid-8402b63ff8edf2ae6268108afbdb3180a64c730b.zip
Merge pull request #686 from iElectric/master
remove pypy from travis-ci allow_failures list
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: