diff options
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | pyramid/tests/test_events.py | 1 | ||||
| -rw-r--r-- | pyramid/tests/test_testing.py | 2 | ||||
| -rw-r--r-- | tox.ini | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 9e296f987..9884c3d19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,10 @@ matrix: env: TOXENV=py35 - python: 3.6 env: TOXENV=py36 - # aws s3 ls s3://travis-python-archives/binaries/ubuntu/14.04/x86_64/ | grep 'pypy.*bz2$' - - python: pypy-5.4.1 + - python: pypy env: TOXENV=pypy + - python: pypy3 + env: TOXENV=pypy3 - python: 3.5 env: TOXENV=py2-cover,py3-cover,coverage - python: 3.5 diff --git a/pyramid/tests/test_events.py b/pyramid/tests/test_events.py index 4f9011cc0..793ac329f 100644 --- a/pyramid/tests/test_events.py +++ b/pyramid/tests/test_events.py @@ -235,6 +235,7 @@ class TestBeforeRender(unittest.TestCase): from pyramid.events import BeforeRender return BeforeRender(system, val) + @testing.skip_on('pypy') # see https://github.com/Pylons/pyramid/issues/3237 def test_instance_conforms(self): from zope.interface.verify import verifyObject from pyramid.interfaces import IBeforeRender diff --git a/pyramid/tests/test_testing.py b/pyramid/tests/test_testing.py index 0b4619de4..86c219988 100644 --- a/pyramid/tests/test_testing.py +++ b/pyramid/tests/test_testing.py @@ -1,5 +1,6 @@ import unittest from zope.component import getSiteManager +from pyramid import testing class TestDummyRootFactory(unittest.TestCase): def _makeOne(self, environ): @@ -526,6 +527,7 @@ class TestDummySession(unittest.TestCase): from pyramid.testing import DummySession return DummySession() + @testing.skip_on('pypy') # see https://github.com/Pylons/pyramid/issues/3237 def test_instance_conforms(self): from zope.interface.verify import verifyObject from pyramid.interfaces import ISession @@ -1,7 +1,7 @@ [tox] envlist = lint, - py27,py34,py35,py36,pypy, + py27,py34,py35,py36,pypy,pypy3, docs,{py2,py3}-cover,coverage, [testenv] @@ -14,6 +14,7 @@ basepython = py36: python3.6 py37: python3.7 pypy: pypy + pypy3: pypy3 py2: python2.7 py3: python3.5 |