Skip to content

Commit 7593c1a

Browse files
committed
Merge remote-tracking branch 'asottile/pypy3'
* asottile/pypy3: Support pypy3
2 parents eb987ac + acbcbb1 commit 7593c1a

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
language: python
22
python:
33
- "pypy"
4+
- "pypy3"
45
- "2.6"
56
- "2.7"
67
- "3.3"

jsonschema/_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def load_schema(name):
5454
5555
"""
5656

57-
data = pkgutil.get_data(__package__, "schemas/{0}.json".format(name))
57+
data = pkgutil.get_data('jsonschema', "schemas/{0}.json".format(name))
5858
return json.loads(data.decode("utf-8"))
5959

6060

tox.ini

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
[tox]
2-
envlist = py26, py27, pypy, py34, docs, style
2+
envlist = py26, py27, pypy, pypy3, py34, docs, style
33

44
[testenv]
5+
# by default tox runs with --pre which tickles this bug:
6+
# https://bitbucket.org/pypy/pypy/issue/1894/keyerror-core-dumped-on-unicode-triple
7+
install_command = pip install {opts} {packages}
58
commands =
69
py.test [] jsonschema
710
{envpython} -m doctest README.rst
@@ -20,7 +23,6 @@ deps =
2023
commands =
2124
py.test [] jsonschema
2225
{envpython} -m doctest README.rst
23-
sphinx-build -b doctest docs {envtmpdir}/html
2426
deps =
2527
{[testenv:all]deps}
2628
{[testenv:notpy26]deps}
@@ -35,7 +37,6 @@ deps =
3537

3638
[testenv:all]
3739
deps =
38-
lxml
3940
pytest
4041
sphinx
4142
strict-rfc3339

0 commit comments

Comments
 (0)