mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2024-12-21 04:10:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8248 from minrk/skip-doctest

Browse Source 
confine doctests to IPython.core
This commit is contained in:
Thomas Kluyver 2015-04-03 17:43:47 -07:00
commit 4f80d4112d
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IPython/html/widgets/widget_link.py
View File

@ -7,7 +7,6 @@ Propagate changes between widgets on the javascript side
# Distributed under the terms of the Modified BSD License. # Distributed under the terms of the Modified BSD License.
from .widget import Widget from .widget import Widget
from IPython.testing.skipdoctest import skip_doctest
from IPython.utils.traitlets import Unicode, Tuple, List,Instance, TraitError from IPython.utils.traitlets import Unicode, Tuple, List,Instance, TraitError
class WidgetTraitTuple(Tuple): class WidgetTraitTuple(Tuple):
@ -51,7 +50,6 @@ class Link(Widget):
self.close() self.close()
@skip_doctest
def jslink(*args): def jslink(*args):
"""Link traits from different widgets together on the frontend so they remain in sync. """Link traits from different widgets together on the frontend so they remain in sync.
@ -92,7 +90,6 @@ class DirectionalLink(Widget):
def unlink(self): def unlink(self):
self.close() self.close()
@skip_doctest
def jsdlink(source, *targets): def jsdlink(source, *targets):
"""Link the trait of a source widget with traits of target widgets in the frontend. """Link the trait of a source widget with traits of target widgets in the frontend.

2
IPython/html/widgets/widget_output.py
View File

@ -10,10 +10,8 @@ from .widget import DOMWidget
import sys import sys
from IPython.utils.traitlets import Unicode, List from IPython.utils.traitlets import Unicode, List
from IPython.display import clear_output from IPython.display import clear_output
from IPython.testing.skipdoctest import skip_doctest
from IPython.kernel.zmq.session import Message from IPython.kernel.zmq.session import Message
@skip_doctest
class Output(DOMWidget): class Output(DOMWidget):
"""Widget used as a context manager to display output. """Widget used as a context manager to display output.

18
IPython/testing/iptest.py
View File

@ -463,10 +463,6 @@ def run_iptest():
argv = sys.argv + [ '--detailed-errors', # extra info in tracebacks argv = sys.argv + [ '--detailed-errors', # extra info in tracebacks
'--with-ipdoctest',
'--ipdoctest-tests','--ipdoctest-extension=txt',
# We add --exe because of setuptools' imbecility (it # We add --exe because of setuptools' imbecility (it
# blindly does chmod +x on ALL files). Nose does the # blindly does chmod +x on ALL files). Nose does the
# right thing and it tries to avoid executables, # right thing and it tries to avoid executables,
@ -489,11 +485,19 @@ def run_iptest():
# for nose >= 0.11, though unfortunately nose 0.10 doesn't support it. # for nose >= 0.11, though unfortunately nose 0.10 doesn't support it.
argv.append('--traverse-namespace') argv.append('--traverse-namespace')
# use our plugin for doctesting. It will remove the standard doctest plugin plugins = [ ExclusionPlugin(section.excludes), KnownFailure(),
# if it finds it enabled
plugins = [ExclusionPlugin(section.excludes), IPythonDoctest(), KnownFailure(),
SubprocessStreamCapturePlugin() ] SubprocessStreamCapturePlugin() ]
# we still have some vestigial doctests in core
if (section.name.startswith(('core', 'IPython.core'))):
plugins.append(IPythonDoctest())
argv.extend([
'--with-ipdoctest',
'--ipdoctest-tests',
'--ipdoctest-extension=txt',
])
# Use working directory set by parent process (see iptestcontroller) # Use working directory set by parent process (see iptestcontroller)
if 'IPTEST_WORKING_DIR' in os.environ: if 'IPTEST_WORKING_DIR' in os.environ:
os.chdir(os.environ['IPTEST_WORKING_DIR']) os.chdir(os.environ['IPTEST_WORKING_DIR'])