diff options
| author | Julian Berman <Julian@GrayVines.com> | 2014-10-31 17:23:26 -0400 |
|---|---|---|
| committer | Julian Berman <Julian@GrayVines.com> | 2014-10-31 17:23:26 -0400 |
| commit | 7593c1a15e062c43341be143733a9ce664f0a872 (patch) | |
| tree | 6684063afbdd5cd24607c5a881aa5308f4543ca6 | |
| parent | eb987ac9ee6c081be4c6607ef7f87e928fb1bb50 (diff) | |
| parent | acbcbb1a160c792db939811803d9d86038589837 (diff) | |
| download | jsonschema-7593c1a15e062c43341be143733a9ce664f0a872.tar.gz | |
Merge remote-tracking branch 'asottile/pypy3'
* asottile/pypy3:
Support pypy3
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | jsonschema/_utils.py | 2 | ||||
| -rw-r--r-- | tox.ini | 7 |
3 files changed, 6 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index e092a0a..1b2cb28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: python python: - "pypy" + - "pypy3" - "2.6" - "2.7" - "3.3" diff --git a/jsonschema/_utils.py b/jsonschema/_utils.py index 2262f33..ae7e2b5 100644 --- a/jsonschema/_utils.py +++ b/jsonschema/_utils.py @@ -54,7 +54,7 @@ def load_schema(name): """ - data = pkgutil.get_data(__package__, "schemas/{0}.json".format(name)) + data = pkgutil.get_data('jsonschema', "schemas/{0}.json".format(name)) return json.loads(data.decode("utf-8")) @@ -1,7 +1,10 @@ [tox] -envlist = py26, py27, pypy, py34, docs, style +envlist = py26, py27, pypy, pypy3, py34, docs, style [testenv] +# by default tox runs with --pre which tickles this bug: +# https://bitbucket.org/pypy/pypy/issue/1894/keyerror-core-dumped-on-unicode-triple +install_command = pip install {opts} {packages} commands = py.test [] jsonschema {envpython} -m doctest README.rst @@ -20,7 +23,6 @@ deps = commands = py.test [] jsonschema {envpython} -m doctest README.rst - sphinx-build -b doctest docs {envtmpdir}/html deps = {[testenv:all]deps} {[testenv:notpy26]deps} @@ -35,7 +37,6 @@ deps = [testenv:all] deps = - lxml pytest sphinx strict-rfc3339 |