summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-09-15 19:23:16 -0400
committerChris McDonough <chrism@plope.com>2012-09-15 19:23:16 -0400
commita98f0cf435e31864e632d9105ffdda30aa776212 (patch)
treef75042c8b99e414eac88ade8f701871acf655e8d /.travis.yml
parent07cb8f0e112642a6a40127232ddc06125a73750e (diff)
parent8402b63ff8edf2ae6268108afbdb3180a64c730b (diff)
downloadpyramid-a98f0cf435e31864e632d9105ffdda30aa776212.tar.gz
pyramid-a98f0cf435e31864e632d9105ffdda30aa776212.tar.bz2
pyramid-a98f0cf435e31864e632d9105ffdda30aa776212.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: