summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2012-09-11 19:38:11 +0200
committerDomen Kožar <domen@dev.si>2012-09-11 19:38:11 +0200
commit4c1933f522731e1ae5874275025a8d20b9e63336 (patch)
treec7e2fdefe34d62f5f94223ea6ccec441045aea05
parentdc8b49f436e3d249c6c9440cf2c1b74acf4a8ad8 (diff)
downloadpyramid-4c1933f522731e1ae5874275025a8d20b9e63336.tar.gz
pyramid-4c1933f522731e1ae5874275025a8d20b9e63336.tar.bz2
pyramid-4c1933f522731e1ae5874275025a8d20b9e63336.zip
remove pypy from travis-ci allow_failures list
-rw-r--r--.travis.yml6
-rw-r--r--CONTRIBUTORS.txt2
2 files changed, 2 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:
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 264acf048..bb11006f3 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -182,3 +182,5 @@ Contributors
- Ian Wilson, 2012/06/17
- Roman Kozlovskyi, 2012/08/11
+
+- Domen Kozar, 2012/09/11