From 1a4b795870241350a567c7105ba51373a2291844 Mon Sep 17 00:00:00 2001 From: MinRK Date: Tue, 24 Jun 2014 20:13:57 -0700 Subject: [PATCH] Use Draft4 JSON Schema for both v3 and v4 no longer need jsonpointer --- IPython/testing/iptestcontroller.py | 2 +- setup.py | 2 +- setupbase.py | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/IPython/testing/iptestcontroller.py b/IPython/testing/iptestcontroller.py index 12ee6106c..3a047132e 100644 --- a/IPython/testing/iptestcontroller.py +++ b/IPython/testing/iptestcontroller.py @@ -218,7 +218,7 @@ def all_js_groups(): class JSController(TestController): """Run CasperJS tests """ requirements = ['zmq', 'tornado', 'jinja2', 'casperjs', 'sqlite3', - 'jsonschema', 'jsonpointer'] + 'jsonschema'] display_slimer_output = False def __init__(self, section, xunit=True, engine='phantomjs'): diff --git a/setup.py b/setup.py index 6733400e5..7d506da28 100755 --- a/setup.py +++ b/setup.py @@ -275,7 +275,7 @@ extras_require = dict( doc = ['Sphinx>=1.1', 'numpydoc'], test = ['nose>=0.10.1'], terminal = [], - nbformat = ['jsonschema>=2.0', 'jsonpointer>=1.3'], + nbformat = ['jsonschema>=2.0'], notebook = ['tornado>=3.1', 'pyzmq>=2.1.11', 'jinja2', 'pygments', 'mistune>=0.3.1'], nbconvert = ['pygments', 'jinja2', 'mistune>=0.3.1'] ) diff --git a/setupbase.py b/setupbase.py index d0495beb3..2516e4fc2 100644 --- a/setupbase.py +++ b/setupbase.py @@ -194,7 +194,10 @@ def find_package_data(): 'preprocessors/tests/files/*.*', ], 'IPython.nbconvert.filters' : ['marked.js'], - 'IPython.nbformat' : ['tests/*.ipynb','v3/v3.withref.json'] + 'IPython.nbformat' : [ + 'tests/*.ipynb', + 'v3/nbformat.v3.schema.json', + ] } return package_data