Skip to content

Commit

Permalink
Merge pull request #2 from NextThought/pypy-support
Browse files Browse the repository at this point in the history
Add support for PyPy.
  • Loading branch information
mgedmin committed May 30, 2015
2 parents 01cccfd + 1125d1b commit fb307f4
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 5 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ python:
- 2.7
- 3.2
- 3.3
- pypy
- pypy3
install:
- pip install . --use-mirrors
- pip install .
script:
- python setup.py test -q
notifications:
Expand Down
2 changes: 1 addition & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Changes
4.1.4 (unreleased)
------------------

- TBD
- Added support for PyPy.


4.1.3 (2014-03-19)
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ def read(*rnames):
"Programming Language :: Python :: 3.3",
"Programming Language :: Python :: 3.4",
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
"Framework :: Zope3",
"Topic :: Software Development :: Libraries :: Python Modules",
"Topic :: Software Development :: Testing",
Expand Down
4 changes: 2 additions & 2 deletions src/zope/testing/doctest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ some of the test files broken:

>>> import tempfile
>>> fn = tempfile.mktemp()
>>> foo = open(fn, 'w').write('Test:\r\n\r\n >>> x = 1 + 1\r\n\r\nDone.\r\n')
>>> with open(fn, 'w') as f:
... _ = f.write('Test:\r\n\r\n >>> x = 1 + 1\r\n\r\nDone.\r\n')

Let's now run it as a doctest:

Expand All @@ -30,4 +31,3 @@ It worked. Let's also try the test file suite:
>>> result = unittest.TestResult()
>>> doctest.DocFileSuite(fn, module_relative=False).run(result) #doctest: +ELLIPSIS
<...TestResult run=1 errors=0 failures=0>

2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
envlist =
py26,py27,py32,py33,py34
py26,py27,py32,py33,py34,pypy,pypy3

[testenv]
commands =
Expand Down

0 comments on commit fb307f4

Please sign in to comment.