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