##// END OF EJS Templates
use jsonschema refs, no need for jsonpointer
MinRK -
Show More
@@ -14,19 +14,11 b' itself from the command line. There are two ways of running this script:'
14 14
15 15 """
16 16
17 #-----------------------------------------------------------------------------
18 # Copyright (C) 2009-2011 The IPython Development Team
19 #
20 # Distributed under the terms of the BSD License. The full license is in
21 # the file COPYING, distributed as part of this software.
22 #-----------------------------------------------------------------------------
17 # Copyright (c) IPython Development Team.
18 # Distributed under the terms of the Modified BSD License.
23 19
24 #-----------------------------------------------------------------------------
25 # Imports
26 #-----------------------------------------------------------------------------
27 20 from __future__ import print_function
28 21
29 # Stdlib
30 22 import glob
31 23 from io import BytesIO
32 24 import os
@@ -35,7 +27,6 b' import sys'
35 27 from threading import Thread, Lock, Event
36 28 import warnings
37 29
38 # Now, proceed to import nose itself
39 30 import nose.plugins.builtin
40 31 from nose.plugins.xunit import Xunit
41 32 from nose import SkipTest
@@ -43,7 +34,6 b' from nose.core import TestProgram'
43 34 from nose.plugins import Plugin
44 35 from nose.util import safe_str
45 36
46 # Our own imports
47 37 from IPython.utils.process import is_cmd_found
48 38 from IPython.utils.importstring import import_item
49 39 from IPython.testing.plugin.ipdoctest import IPythonDoctest
@@ -148,7 +138,6 b" have['mistune'] = test_for('mistune')"
148 138 have['requests'] = test_for('requests')
149 139 have['sphinx'] = test_for('sphinx')
150 140 have['jsonschema'] = test_for('jsonschema')
151 have['jsonpointer'] = test_for('jsonpointer')
152 141 have['casperjs'] = is_cmd_found('casperjs')
153 142 have['phantomjs'] = is_cmd_found('phantomjs')
154 143 have['slimerjs'] = is_cmd_found('slimerjs')
@@ -268,7 +257,7 b" test_sections['qt'].requires('zmq', 'qt', 'pygments')"
268 257
269 258 # html:
270 259 sec = test_sections['html']
271 sec.requires('zmq', 'tornado', 'requests', 'sqlite3', 'jsonschema', 'jsonpointer')
260 sec.requires('zmq', 'tornado', 'requests', 'sqlite3', 'jsonschema')
272 261 # The notebook 'static' directory contains JS, css and other
273 262 # files for web serving. Occasionally projects may put a .py
274 263 # file in there (MathJax ships a conf.py), so we might as
@@ -286,7 +275,7 b" test_sections['config'].exclude('profile')"
286 275
287 276 # nbconvert:
288 277 sec = test_sections['nbconvert']
289 sec.requires('pygments', 'jinja2', 'jsonschema', 'jsonpointer', 'mistune')
278 sec.requires('pygments', 'jinja2', 'jsonschema', 'mistune')
290 279 # Exclude nbconvert directories containing config files used to test.
291 280 # Executing the config files with iptest would cause an exception.
292 281 sec.exclude('tests.files')
@@ -296,7 +285,7 b" if not have['tornado']:"
296 285 sec.exclude('nbconvert.post_processors.tests.test_serve')
297 286
298 287 # nbformat:
299 test_sections['nbformat'].requires('jsonschema', 'jsonpointer')
288 test_sections['nbformat'].requires('jsonschema')
300 289
301 290 #-----------------------------------------------------------------------------
302 291 # Functions and classes
General Comments 0
You need to be logged in to leave comments. Login now