##// END OF EJS Templates
Merge pull request #6128 from jasongrout/widget-trait-serialization...
Merge pull request #6128 from jasongrout/widget-trait-serialization Widget trait serialization

File last commit:

r16648:67a16482
r17330:3c3d1ae5 merge
Show More
ipython_directive.py
1154 lines | 40.3 KiB | text/x-python | PythonLexer
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 # -*- coding: utf-8 -*-
chebee7i
Docstring updates.
r13901 """
Sphinx directive to support embedded IPython code.
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
This directive allows pasting of entire interactive IPython sessions, prompts
and all, and their code will actually get re-executed at doc build time, with
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 all prompts renumbered sequentially. It also allows you to input code as a pure
python input by giving the argument python to the directive. The output looks
like an interactive ipython section.
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
To enable this directive, simply list it in your Sphinx ``conf.py`` file
(making sure the directory where you placed it is visible to sphinx, as is
chebee7i
Make 'matplotlib' optional when using the ipython directive.
r13658 needed for all Sphinx directives). For example, to enable syntax highlighting
and the IPython directive::
extensions = ['IPython.sphinxext.ipython_console_highlighting',
'IPython.sphinxext.ipython_directive']
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
chebee7i
Update module docstring for IPython directive.
r13660 The IPython directive outputs code-blocks with the language 'ipython'. So
if you do not have the syntax highlighting extension enabled as well, then
all rendered code-blocks will be uncolored. By default this directive assumes
that your prompts are unchanged IPython ones, but this can be customized.
The configurable options that can be placed in conf.py are:
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432
ipython_savefig_dir:
The directory in which to save the figures. This is relative to the
Sphinx source directory. The default is `html_static_path`.
ipython_rgxin:
The compiled regular expression to denote the start of IPython input
lines. The default is re.compile('In \[(\d+)\]:\s?(.*)\s*'). You
shouldn't need to change this.
ipython_rgxout:
The compiled regular expression to denote the start of IPython output
lines. The default is re.compile('Out\[(\d+)\]:\s?(.*)\s*'). You
shouldn't need to change this.
ipython_promptin:
The string to represent the IPython input prompt in the generated ReST.
The default is 'In [%d]:'. This expects that the line numbers are used
in the prompt.
ipython_promptout:
The string to represent the IPython prompt in the generated ReST. The
default is 'Out [%d]:'. This expects that the line numbers are used
in the prompt.
chebee7i
Make 'matplotlib' optional when using the ipython directive.
r13658 ipython_mplbackend:
The string which specifies if the embedded Sphinx shell should import
chebee7i
Clean up handling of default values for ipython_mplbackend, ipython_execlines....
r13801 Matplotlib and set the backend. The value specifies a backend that is
chebee7i
Simplify ipython_directive backend specification.
r13810 passed to `matplotlib.use()` before any lines in `ipython_execlines` are
chebee7i
Default backend is 'agg'. `None` is no matplotlib.
r13873 executed. If not specified in conf.py, then the default value of 'agg' is
used. To use the IPython directive without matplotlib as a dependency, set
the value to `None`. It may end up that matplotlib is still imported
if the user specifies so in `ipython_execlines` or makes use of the
@savefig pseudo decorator.
chebee7i
Add `ipython_execlines` option to IPython directive.
r13659 ipython_execlines:
chebee7i
Default backend is 'agg'. `None` is no matplotlib.
r13873 A list of strings to be exec'd in the embedded Sphinx shell. Typical
chebee7i
Clean up handling of default values for ipython_mplbackend, ipython_execlines....
r13801 usage is to make certain packages always available. Set this to an empty
list if you wish to have no imports always available. If specified in
chebee7i
Default backend is 'agg'. `None` is no matplotlib.
r13873 conf.py as `None`, then it has the effect of making no imports available.
If omitted from conf.py altogether, then the default value of
['import numpy as np', 'import matplotlib.pyplot as plt'] is used.
chebee7i
Hold the execution count for @suppress'd inputs.
r13902 ipython_holdcount
When the @suppress pseudo-decorator is used, the execution count can be
incremented or not. The default behavior is to hold the execution count,
corresponding to a value of `True`. Set this to `False` to increment
the execution count after each suppressed command.
chebee7i
Make 'matplotlib' optional when using the ipython directive.
r13658
As an example, to use the IPython directive when `matplotlib` is not available,
chebee7i
Minor docstring adjustment.
r13876 one sets the backend to `None`::
chebee7i
Make 'matplotlib' optional when using the ipython directive.
r13658
chebee7i
Minor docstring adjustment.
r13876 ipython_mplbackend = None
chebee7i
Make 'matplotlib' optional when using the ipython directive.
r13658
chebee7i
Update module docstring for IPython directive.
r13660 An example usage of the directive is:
.. code-block:: rst
.. ipython::
In [1]: x = 1
In [2]: y = x**2
In [3]: print(y)
chebee7i
Default backend is 'agg'. `None` is no matplotlib.
r13873 See http://matplotlib.org/sampledoc/ipython_directive.html for additional
chebee7i
Update module docstring for IPython directive.
r13660 documentation.
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
y-p
Document :okexcept:, :okwarning: in file header
r14936 Pseudo-Decorators
=================
chebee7i
Fix submitted output in verbatim mode.
r16646 Note: Only one decorator is supported per input. If more than one decorator
is specified, then only the last one is used.
y-p
Document :okexcept:, :okwarning: in file header
r14936 In addition to the Pseudo-Decorators/options described at the above link,
chebee7i
Fix submitted output in verbatim mode.
r16646 several enhancements have been made. The directive will emit a message to the
console at build-time if code-execution resulted in an exception or warning.
You can suppress these on a per-block basis by specifying the :okexcept:
or :okwarning: options:
y-p
Document :okexcept:, :okwarning: in file header
r14936
.. code-block:: rst
.. ipython::
:okexcept:
:okwarning:
In [1]: 1/0
In [2]: # raise warning.
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 ToDo
----
- Turn the ad-hoc test() function into a real test suite.
- Break up ipython-specific functionality from matplotlib stuff into better
separated code.
Authors
-------
- John D Hunter: orignal author.
- Fernando Perez: refactoring, documentation, cleanups, port to 0.11.
- VáclavŠmilauer <eudoxos-AT-arcig.cz>: Prompt generalizations.
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 - Skipper Seabold, refactoring, cleanups, pure python addition
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 """
Thomas Kluyver
Convert print statements to print function calls...
r13348 from __future__ import print_function
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
# Stdlib
import os
import re
import sys
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 import tempfile
Skipper Seabold
Fix imports
r6136 import ast
y-p
ipython_directive, report except/warn in block and add :okexcept: :okwarning: options to suppress
r14779 import warnings
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
# To keep compatibility with various python versions
try:
from hashlib import md5
except ImportError:
from md5 import md5
# Third-party
import sphinx
from docutils.parsers.rst import directives
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 from docutils import nodes
from sphinx.util.compat import Directive
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
# Our own
Brian Granger
More work addressing review comments for Fernando's branch....
r2499 from IPython import Config, InteractiveShell
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 from IPython.core.profiledir import ProfileDir
from IPython.utils import io
Thomas Kluyver
Use StringIO.StringIO on Python 2....
r13366 from IPython.utils.py3compat import PY3
if PY3:
from io import StringIO
else:
from StringIO import StringIO
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
#-----------------------------------------------------------------------------
# Globals
#-----------------------------------------------------------------------------
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 # for tokenizing blocks
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 COMMENT, INPUT, OUTPUT = range(3)
#-----------------------------------------------------------------------------
# Functions and class declarations
#-----------------------------------------------------------------------------
chebee7i
Add 'float' option to @doctest pseudo-decorator.
r13680
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 def block_parser(part, rgxin, rgxout, fmtin, fmtout):
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 """
part is a string of ipython text, comprised of at most one
input, one ouput, comments, and blank lines. The block parser
parses the text into a list of::
blocks = [ (TOKEN0, data0), (TOKEN1, data1), ...]
where TOKEN is one of [COMMENT | INPUT | OUTPUT ] and
data is, depending on the type of token::
COMMENT : the comment string
INPUT: the (DECORATOR, INPUT_LINE, REST) where
DECORATOR: the input decorator (or None)
INPUT_LINE: the input as string (possibly multi-line)
REST : any stdout generated by the input line (not OUTPUT)
OUTPUT: the output string, possibly multi-line
chebee7i
Make 'matplotlib' optional when using the ipython directive.
r13658 """
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 block = []
lines = part.split('\n')
N = len(lines)
i = 0
decorator = None
while 1:
if i==N:
# nothing left to parse -- the last line
break
line = lines[i]
i += 1
line_stripped = line.strip()
if line_stripped.startswith('#'):
block.append((COMMENT, line))
continue
if line_stripped.startswith('@'):
chebee7i
Fix submitted output in verbatim mode.
r16646 # Here is where we assume there is, at most, one decorator.
# Might need to rethink this.
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 decorator = line_stripped
continue
# does this look like an input line?
matchin = rgxin.match(line)
if matchin:
lineno, inputline = int(matchin.group(1)), matchin.group(2)
# the ....: continuation string
continuation = ' %s:'%''.join(['.']*(len(str(lineno))+2))
Nc = len(continuation)
# input lines can continue on for more than one line, if
# we have a '\' line continuation char or a function call
# echo line 'print'. The input line can only be
# terminated by the end of the block or an output line, so
# we parse out the rest of the input line if it is
# multiline as well as any echo text
rest = []
while i<N:
# look ahead; if the next line is blank, or a comment, or
# an output line, we're done
nextline = lines[i]
matchout = rgxout.match(nextline)
#print "nextline=%s, continuation=%s, starts=%s"%(nextline, continuation, nextline.startswith(continuation))
if matchout or nextline.startswith('#'):
break
elif nextline.startswith(continuation):
y-p
add additional clarification in ip_d re prompt stripping
r14812 # The default ipython_rgx* treat the space following the colon as optional.
# However, If the space is there we must consume it or code
# employing the cython_magic extension will fail to execute.
#
# This works with the default ipython_rgx* patterns,
# If you modify them, YMMV.
y-p
BUG: ipython_directive now supports cython magic (remove dangling space) GH4791
r14213 nextline = nextline[Nc:]
if nextline and nextline[0] == ' ':
nextline = nextline[1:]
inputline += '\n' + nextline
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 else:
rest.append(nextline)
i+= 1
block.append((INPUT, (decorator, inputline, '\n'.join(rest))))
continue
# if it looks like an output line grab all the text to the end
# of the block
matchout = rgxout.match(line)
if matchout:
lineno, output = int(matchout.group(1)), matchout.group(2)
if i<N-1:
output = '\n'.join([output] + lines[i:])
block.append((OUTPUT, output))
break
return block
chebee7i
Place customized doctests in a separate module.
r13843
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 class EmbeddedSphinxShell(object):
"""An embedded IPython instance to run inside Sphinx"""
y-p
Remove explicit passing state arg in favor of self.directive.state
r14799 def __init__(self, exec_lines=None):
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
Thomas Kluyver
Use StringIO.StringIO on Python 2....
r13366 self.cout = StringIO()
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
chebee7i
Add `ipython_execlines` option to IPython directive.
r13659 if exec_lines is None:
chebee7i
Clean up handling of default values for ipython_mplbackend, ipython_execlines....
r13801 exec_lines = []
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
# Create config object for IPython
config = Config()
config.InteractiveShell.autocall = False
config.InteractiveShell.autoindent = False
config.InteractiveShell.colors = 'NoColor'
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 # create a profile so instance history isn't saved
tmp_profile_dir = tempfile.mkdtemp(prefix='profile_')
profname = 'auto_profile_sphinx_build'
pdir = os.path.join(tmp_profile_dir,profname)
profile = ProfileDir.create_profile_dir(pdir)
chebee7i
Fix bug where exec_lines was ignored within ipython directive.
r13674 # Create and initialize global ipython, but don't start its mainloop.
# This will persist across different EmbededSphinxShell instances.
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 IP = InteractiveShell.instance(config=config, profile_dir=profile)
chebee7i
Fix bug where exec_lines was ignored within ipython directive.
r13674
chebee7i
Docstring update for Sphinx IPython directive.
r13895 # io.stdout redirect must be done after instantiating InteractiveShell
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 io.stdout = self.cout
io.stderr = self.cout
# For debugging, so we can see normal output, use this:
#from IPython.utils.io import Tee
#io.stdout = Tee(self.cout, channel='stdout') # dbg
#io.stderr = Tee(self.cout, channel='stderr') # dbg
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
# Store a few parts of IPython we'll need.
Brian Granger
More work addressing review comments for Fernando's branch....
r2499 self.IP = IP
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 self.user_ns = self.IP.user_ns
self.user_global_ns = self.IP.user_global_ns
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 self.input = ''
self.output = ''
self.is_verbatim = False
self.is_doctest = False
self.is_suppress = False
chebee7i
Provide helpful error messages on doctest failures.
r13863 # Optionally, provide more detailed information to shell.
y-p
Remove explicit passing state arg in favor of self.directive.state
r14799 # this is assigned by the SetUp method of IPythonDirective
# to point at itself.
#
# So, you can access handy things at self.directive.state
chebee7i
Provide helpful error messages on doctest failures.
r13863 self.directive = None
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 # on the first call to the savefig decorator, we'll import
# pyplot as plt so we can make a call to the plt.gcf().savefig
self._pyplot_imported = False
chebee7i
Fix bug where exec_lines was ignored within ipython directive.
r13674 # Prepopulate the namespace.
for line in exec_lines:
self.process_input_line(line, store_history=False)
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 def clear_cout(self):
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 self.cout.seek(0)
self.cout.truncate(0)
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 def process_input_line(self, line, store_history=True):
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 """process the input, capturing stdout"""
chebee7i
Provide helpful error messages on doctest failures.
r13863
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 stdout = sys.stdout
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 splitter = self.IP.input_splitter
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 try:
sys.stdout = self.cout
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 splitter.push(line)
more = splitter.push_accepts_more()
if not more:
Thomas Kluyver
Simplify IPythonInputSplitter API
r13912 source_raw = splitter.raw_reset()
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 self.IP.run_cell(source_raw, store_history=store_history)
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 finally:
sys.stdout = stdout
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 def process_image(self, decorator):
"""
# build out an image directive like
# .. image:: somefile.png
# :width 4in
#
# from an input like
# savefig somefile.png width=4in
"""
savefig_dir = self.savefig_dir
source_dir = self.source_dir
saveargs = decorator.split(' ')
filename = saveargs[1]
# insert relative path to image file in source
outfile = os.path.relpath(os.path.join(savefig_dir,filename),
source_dir)
imagerows = ['.. image:: %s'%outfile]
for kwarg in saveargs[2:]:
arg, val = kwarg.split('=')
arg = arg.strip()
val = val.strip()
imagerows.append(' :%s: %s'%(arg, val))
image_file = os.path.basename(outfile) # only return file name
image_directive = '\n'.join(imagerows)
return image_file, image_directive
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 # Callbacks for each type of token
def process_input(self, data, input_prompt, lineno):
chebee7i
Provide helpful error messages on doctest failures.
r13863 """
Process data block for INPUT token.
"""
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 decorator, input, rest = data
image_file = None
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 image_directive = None
chebee7i
Provide helpful error messages on doctest failures.
r13863
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 is_verbatim = decorator=='@verbatim' or self.is_verbatim
chebee7i
Add 'float' option to @doctest pseudo-decorator.
r13680 is_doctest = (decorator is not None and \
decorator.startswith('@doctest')) or self.is_doctest
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 is_suppress = decorator=='@suppress' or self.is_suppress
y-p
ipython_directive, report except/warn in block and add :okexcept: :okwarning: options to suppress
r14779 is_okexcept = decorator=='@okexcept' or self.is_okexcept
is_okwarning = decorator=='@okwarning' or self.is_okwarning
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 is_savefig = decorator is not None and \
decorator.startswith('@savefig')
input_lines = input.split('\n')
Skipper Seabold
Make sure splitter._buffer is reset. Handle suppressed output better
r6135 if len(input_lines) > 1:
if input_lines[-1] != "":
input_lines.append('') # make sure there's a blank line
# so splitter buffer gets reset
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
continuation = ' %s:'%''.join(['.']*(len(str(lineno))+2))
if is_savefig:
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 image_file, image_directive = self.process_image(decorator)
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
ret = []
is_semicolon = False
chebee7i
Hold the execution count for @suppress'd inputs.
r13902 # Hold the execution count, if requested to do so.
if is_suppress and self.hold_count:
store_history = False
else:
store_history = True
y-p
ipython_directive, report except/warn in block and add :okexcept: :okwarning: options to suppress
r14779 # Note: catch_warnings is not thread safe
with warnings.catch_warnings(record=True) as ws:
for i, line in enumerate(input_lines):
if line.endswith(';'):
is_semicolon = True
if i == 0:
# process the first input line
if is_verbatim:
self.process_input_line('')
self.IP.execution_count += 1 # increment it anyway
else:
# only submit the line in non-verbatim mode
self.process_input_line(line, store_history=store_history)
formatted_line = '%s %s'%(input_prompt, line)
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 else:
y-p
ipython_directive, report except/warn in block and add :okexcept: :okwarning: options to suppress
r14779 # process a continuation line
if not is_verbatim:
self.process_input_line(line, store_history=store_history)
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
y-p
ipython_directive, report except/warn in block and add :okexcept: :okwarning: options to suppress
r14779 formatted_line = '%s %s'%(continuation, line)
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
y-p
ipython_directive, report except/warn in block and add :okexcept: :okwarning: options to suppress
r14779 if not is_suppress:
ret.append(formatted_line)
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
Skipper Seabold
Make sure splitter._buffer is reset. Handle suppressed output better
r6135 if not is_suppress and len(rest.strip()) and is_verbatim:
chebee7i
Clarify comment in ipython directive.
r16648 # The "rest" is the standard output of the input. This needs to be
# added when in verbatim mode. If there is no "rest", then we don't
# add it, as the new line will be added by the processed output.
Skipper Seabold
Make sure splitter._buffer is reset. Handle suppressed output better
r6135 ret.append(rest)
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
chebee7i
Fix submitted output in verbatim mode.
r16646 # Fetch the processed output. (This is not the submitted output.)
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 self.cout.seek(0)
chebee7i
Fix submitted output in verbatim mode.
r16646 processed_output = self.cout.read()
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 if not is_suppress and not is_semicolon:
chebee7i
Fix submitted output in verbatim mode.
r16646 #
# In IPythonDirective.run, the elements of `ret` are eventually
# combined such that '' entries correspond to newlines. So if
# `processed_output` is equal to '', then the adding it to `ret`
# ensures that there is a blank line between consecutive inputs
# that have no outputs, as in:
#
# In [1]: x = 4
#
# In [2]: x = 5
#
# When there is processed output, it has a '\n' at the tail end. So
# adding the output to `ret` will provide the necessary spacing
# between consecutive input/output blocks, as in:
#
# In [1]: x
# Out[1]: 5
#
# In [2]: x
# Out[2]: 5
#
# When there is stdout from the input, it also has a '\n' at the
# tail end, and so this ensures proper spacing as well. E.g.:
#
# In [1]: print x
# 5
#
# In [2]: x = 5
#
# When in verbatim mode, `processed_output` is empty (because
# nothing was passed to IP. Sometimes the submitted code block has
# an Out[] portion and sometimes it does not. When it does not, we
# need to ensure proper spacing, so we have to add '' to `ret`.
# However, if there is an Out[] in the submitted code, then we do
# not want to add a newline as `process_output` has stuff to add.
# The difficulty is that `process_input` doesn't know if
# `process_output` will be called---so it doesn't know if there is
# Out[] in the code block. The requires that we include a hack in
# `process_block`. See the comments there.
#
ret.append(processed_output)
elif is_semicolon:
# Make sure there is a newline after the semicolon.
Skipper Seabold
Make sure splitter._buffer is reset. Handle suppressed output better
r6135 ret.append('')
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
y-p
ipython_directive, report except/warn in block and add :okexcept: :okwarning: options to suppress
r14779 # context information
y-p
Guard against self.state is None
r14781 filename = "Unknown"
lineno = 0
y-p
Remove explicit passing state arg in favor of self.directive.state
r14799 if self.directive.state:
filename = self.directive.state.document.current_source
lineno = self.directive.state.document.current_line
y-p
ipython_directive, report except/warn in block and add :okexcept: :okwarning: options to suppress
r14779
# output any exceptions raised during execution to stdout
# unless :okexcept: has been specified.
chebee7i
Fix submitted output in verbatim mode.
r16646 if not is_okexcept and "Traceback" in processed_output:
y-p
ipython_directive, report except/warn in block and add :okexcept: :okwarning: options to suppress
r14779 s = "\nException in %s at block ending on line %s\n" % (filename, lineno)
s += "Specify :okexcept: as an option in the ipython:: block to suppress this message\n"
sys.stdout.write('\n\n>>>' + ('-' * 73))
sys.stdout.write(s)
chebee7i
Fix submitted output in verbatim mode.
r16646 sys.stdout.write(processed_output)
y-p
ipython_directive, report except/warn in block and add :okexcept: :okwarning: options to suppress
r14779 sys.stdout.write('<<<' + ('-' * 73) + '\n\n')
# output any warning raised during execution to stdout
# unless :okwarning: has been specified.
if not is_okwarning:
for w in ws:
s = "\nWarning in %s at block ending on line %s\n" % (filename, lineno)
s += "Specify :okwarning: as an option in the ipython:: block to suppress this message\n"
sys.stdout.write('\n\n>>>' + ('-' * 73))
sys.stdout.write(s)
sys.stdout.write(('-' * 76) + '\n')
s=warnings.formatwarning(w.message, w.category,
w.filename, w.lineno, w.line)
sys.stdout.write(s)
sys.stdout.write('<<<' + ('-' * 73) + '\n')
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 self.cout.truncate(0)
chebee7i
Fix submitted output in verbatim mode.
r16646
return (ret, input_lines, processed_output,
is_doctest, decorator, image_file, image_directive)
chebee7i
Provide helpful error messages on doctest failures.
r13863
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
chebee7i
Fix submitted output in verbatim mode.
r16646 def process_output(self, data, output_prompt, input_lines, output,
is_doctest, decorator, image_file):
chebee7i
Provide helpful error messages on doctest failures.
r13863 """
Process data block for OUTPUT token.
"""
chebee7i
Fix submitted output in verbatim mode.
r16646 # Recall: `data` is the submitted output, and `output` is the processed
# output from `input_lines`.
chebee7i
Provide helpful error messages on doctest failures.
r13863 TAB = ' ' * 4
chebee7i
Add 'float' option to @doctest pseudo-decorator.
r13680 if is_doctest and output is not None:
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432
chebee7i
Fix submitted output in verbatim mode.
r16646 found = output # This is the processed output
chebee7i
Add 'float' option to @doctest pseudo-decorator.
r13680 found = found.strip()
submitted = data.strip()
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
chebee7i
Provide helpful error messages on doctest failures.
r13863 if self.directive is None:
source = 'Unavailable'
content = 'Unavailable'
else:
source = self.directive.state.document.current_source
content = self.directive.content
# Add tabs and join into a single string.
content = '\n'.join([TAB + line for line in content])
chebee7i
Add 'float' option to @doctest pseudo-decorator.
r13680 # Make sure the output contains the output prompt.
ind = found.find(output_prompt)
if ind < 0:
chebee7i
Provide helpful error messages on doctest failures.
r13863 e = ('output does not contain output prompt\n\n'
'Document source: {0}\n\n'
'Raw content: \n{1}\n\n'
'Input line(s):\n{TAB}{2}\n\n'
'Output line(s):\n{TAB}{3}\n\n')
e = e.format(source, content, '\n'.join(input_lines),
repr(found), TAB=TAB)
chebee7i
Add 'float' option to @doctest pseudo-decorator.
r13680 raise RuntimeError(e)
found = found[len(output_prompt):].strip()
# Handle the actual doctest comparison.
if decorator.strip() == '@doctest':
# Standard doctest
if found != submitted:
chebee7i
Provide helpful error messages on doctest failures.
r13863 e = ('doctest failure\n\n'
'Document source: {0}\n\n'
'Raw content: \n{1}\n\n'
'On input line(s):\n{TAB}{2}\n\n'
'we found output:\n{TAB}{3}\n\n'
'instead of the expected:\n{TAB}{4}\n\n')
e = e.format(source, content, '\n'.join(input_lines),
repr(found), repr(submitted), TAB=TAB)
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 raise RuntimeError(e)
chebee7i
Add 'float' option to @doctest pseudo-decorator.
r13680 else:
chebee7i
Place customized doctests in a separate module.
r13843 self.custom_doctest(decorator, input_lines, found, submitted)
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
chebee7i
Fix submitted output in verbatim mode.
r16646 # When in verbatim mode, this holds additional submitted output
# to be written in the final Sphinx output.
chebee7i
Add output to IPython directive when in verbatim mode....
r16644 # https://github.com/ipython/ipython/issues/5776
chebee7i
Fix submitted output in verbatim mode.
r16646 out_data = []
chebee7i
Add output to IPython directive when in verbatim mode....
r16644 is_verbatim = decorator=='@verbatim' or self.is_verbatim
chebee7i
Fix submitted output in verbatim mode.
r16646 if is_verbatim and data.strip():
# Note that `ret` in `process_block` has '' as its last element if
# the code block was in verbatim mode. So if there is no submitted
# output, then we will have proper spacing only if we do not add
# an additional '' to `out_data`. This is why we condition on
# `and data.strip()`.
# The submitted output has no output prompt. If we want the
# prompt and the code to appear, we need to join them now
# instead of adding them separately---as this would create an
# undesired newline. How we do this ultimately depends on the
# format of the output regex. I'll do what works for the default
# prompt for now, and we might have to adjust if it doesn't work
# in other cases. Finally, the submitted output does not have
# a trailing newline, so we must add it manually.
out_data.append("{0} {1}\n".format(output_prompt, data))
chebee7i
Add output to IPython directive when in verbatim mode....
r16644
return out_data
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 def process_comment(self, data):
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 """Process data fPblock for COMMENT token."""
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 if not self.is_suppress:
return [data]
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 def save_image(self, image_file):
"""
Saves the image file to disk.
"""
self.ensure_pyplot()
command = 'plt.gcf().savefig("%s")'%image_file
#print 'SAVEFIG', command # dbg
self.process_input_line('bookmark ipy_thisdir', store_history=False)
self.process_input_line('cd -b ipy_savedir', store_history=False)
self.process_input_line(command, store_history=False)
self.process_input_line('cd -b ipy_thisdir', store_history=False)
self.process_input_line('bookmark -d ipy_thisdir', store_history=False)
self.clear_cout()
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 def process_block(self, block):
"""
process block from the block_parser and return a list of processed lines
"""
ret = []
output = None
input_lines = None
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 lineno = self.IP.execution_count
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
chebee7i
Default backend is 'agg'. `None` is no matplotlib.
r13873 input_prompt = self.promptin % lineno
output_prompt = self.promptout % lineno
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 image_file = None
image_directive = None
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 for token, data in block:
chebee7i
Default backend is 'agg'. `None` is no matplotlib.
r13873 if token == COMMENT:
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 out_data = self.process_comment(data)
chebee7i
Default backend is 'agg'. `None` is no matplotlib.
r13873 elif token == INPUT:
chebee7i
Fix submitted output in verbatim mode.
r16646 (out_data, input_lines, output, is_doctest,
decorator, image_file, image_directive) = \
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 self.process_input(data, input_prompt, lineno)
chebee7i
Default backend is 'agg'. `None` is no matplotlib.
r13873 elif token == OUTPUT:
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 out_data = \
chebee7i
Fix submitted output in verbatim mode.
r16646 self.process_output(data, output_prompt, input_lines,
output, is_doctest, decorator,
image_file)
if out_data:
# Then there was user submitted output in verbatim mode.
# We need to remove the last element of `ret` that was
# added in `process_input`, as it is '' and would introduce
# an undesirable newline.
assert(ret[-1] == '')
del ret[-1]
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 if out_data:
ret.extend(out_data)
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 # save the image files
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 if image_file is not None:
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 self.save_image(image_file)
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 return ret, image_directive
def ensure_pyplot(self):
chebee7i
Default backend is 'agg'. `None` is no matplotlib.
r13873 """
Ensures that pyplot has been imported into the embedded IPython shell.
Also, makes sure to set the backend appropriately if not set already.
"""
# We are here if the @figure pseudo decorator was used. Thus, it's
# possible that we could be here even if python_mplbackend were set to
# `None`. That's also strange and perhaps worthy of raising an
# exception, but for now, we just set the backend to 'agg'.
if not self._pyplot_imported:
if 'matplotlib.backends' not in sys.modules:
# Then ipython_matplotlib was set to None but there was a
# call to the @figure decorator (and ipython_execlines did
# not set a backend).
#raise Exception("No backend was set, but @figure was used!")
import matplotlib
matplotlib.use('agg')
# Always import pyplot into embedded shell.
self.process_input_line('import matplotlib.pyplot as plt',
store_history=False)
self._pyplot_imported = True
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 def process_pure_python(self, content):
"""
chebee7i
Add 'float' option to @doctest pseudo-decorator.
r13680 content is a list of strings. it is unedited directive content
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432
This runs it line by line in the InteractiveShell, prepends
prompts as needed capturing stderr and stdout, then returns
the content as a list as if it were ipython code
"""
output = []
savefig = False # keep up with this to clear figure
multiline = False # to handle line continuation
Skipper Seabold
Use AST parser to find python multilines with function handling
r6134 multiline_start = None
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 fmtin = self.promptin
Skipper Seabold
Use AST parser to find python multilines with function handling
r6134 ct = 0
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 for lineno, line in enumerate(content):
line_stripped = line.strip()
if not len(line):
Skipper Seabold
Use AST parser to find python multilines with function handling
r6134 output.append(line)
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 continue
# handle decorators
if line_stripped.startswith('@'):
output.extend([line])
if 'savefig' in line:
savefig = True # and need to clear figure
continue
# handle comments
if line_stripped.startswith('#'):
output.extend([line])
continue
Skipper Seabold
Use AST parser to find python multilines with function handling
r6134 # deal with lines checking for multiline
continuation = u' %s:'% ''.join(['.']*(len(str(ct))+2))
if not multiline:
modified = u"%s %s" % (fmtin % ct, line_stripped)
output.append(modified)
ct += 1
try:
ast.parse(line_stripped)
output.append(u'')
except Exception: # on a multiline
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 multiline = True
Skipper Seabold
Use AST parser to find python multilines with function handling
r6134 multiline_start = lineno
else: # still on a multiline
modified = u'%s %s' % (continuation, line)
output.append(modified)
Ahmet Bakan
Fixed a problem with evaluating indented lines in pure python code....
r10597
# if the next line is indented, it should be part of multiline
if len(content) > lineno + 1:
nextline = content[lineno + 1]
if len(nextline) - len(nextline.lstrip()) > 3:
continue
Skipper Seabold
Use AST parser to find python multilines with function handling
r6134 try:
mod = ast.parse(
'\n'.join(content[multiline_start:lineno+1]))
if isinstance(mod.body[0], ast.FunctionDef):
# check to see if we have the whole function
for element in mod.body[0].body:
if isinstance(element, ast.Return):
multiline = False
else:
output.append(u'')
multiline = False
except Exception:
pass
if savefig: # clear figure if plotted
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 self.ensure_pyplot()
self.process_input_line('plt.clf()', store_history=False)
self.clear_cout()
savefig = False
return output
chebee7i
Place customized doctests in a separate module.
r13843 def custom_doctest(self, decorator, input_lines, found, submitted):
chebee7i
Add 'float' option to @doctest pseudo-decorator.
r13680 """
Perform a specialized doctest.
"""
chebee7i
Place customized doctests in a separate module.
r13843 from .custom_doctests import doctests
chebee7i
Add 'float' option to @doctest pseudo-decorator.
r13680
args = decorator.split()
doctest_type = args[1]
chebee7i
Place customized doctests in a separate module.
r13843 if doctest_type in doctests:
doctests[doctest_type](self, args, input_lines, found, submitted)
else:
chebee7i
Add 'float' option to @doctest pseudo-decorator.
r13680 e = "Invalid option to @doctest: {0}".format(doctest_type)
raise Exception(e)
MinRK
don't instantiate IPython shell as class attr...
r13150 class IPythonDirective(Directive):
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432
has_content = True
required_arguments = 0
optional_arguments = 4 # python, suppress, verbatim, doctest
final_argumuent_whitespace = True
option_spec = { 'python': directives.unchanged,
'suppress' : directives.flag,
'verbatim' : directives.flag,
'doctest' : directives.flag,
y-p
ipython_directive, report except/warn in block and add :okexcept: :okwarning: options to suppress
r14779 'okexcept': directives.flag,
'okwarning': directives.flag
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 }
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
MinRK
don't instantiate IPython shell as class attr...
r13150 shell = None
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
Ahmet Bakan
Using a class varilable instead of temp files for keeping track of docs....
r10596 seen_docs = set()
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 def get_config_options(self):
# contains sphinx configuration variables
config = self.state.document.settings.env.config
# get config variables to set figure output directory
confdir = self.state.document.settings.env.app.confdir
savefig_dir = config.ipython_savefig_dir
source_dir = os.path.dirname(self.state.document.current_source)
if savefig_dir is None:
savefig_dir = config.html_static_path
if isinstance(savefig_dir, list):
savefig_dir = savefig_dir[0] # safe to assume only one path?
savefig_dir = os.path.join(confdir, savefig_dir)
# get regex and prompt stuff
chebee7i
Make 'matplotlib' optional when using the ipython directive.
r13658 rgxin = config.ipython_rgxin
rgxout = config.ipython_rgxout
promptin = config.ipython_promptin
promptout = config.ipython_promptout
mplbackend = config.ipython_mplbackend
chebee7i
Add `ipython_execlines` option to IPython directive.
r13659 exec_lines = config.ipython_execlines
chebee7i
Hold the execution count for @suppress'd inputs.
r13902 hold_count = config.ipython_holdcount
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432
chebee7i
Make 'matplotlib' optional when using the ipython directive.
r13658 return (savefig_dir, source_dir, rgxin, rgxout,
chebee7i
Hold the execution count for @suppress'd inputs.
r13902 promptin, promptout, mplbackend, exec_lines, hold_count)
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432
def setup(self):
chebee7i
Make 'matplotlib' optional when using the ipython directive.
r13658 # Get configuration values.
chebee7i
Hold the execution count for @suppress'd inputs.
r13902 (savefig_dir, source_dir, rgxin, rgxout, promptin, promptout,
mplbackend, exec_lines, hold_count) = self.get_config_options()
chebee7i
Make 'matplotlib' optional when using the ipython directive.
r13658
MinRK
don't instantiate IPython shell as class attr...
r13150 if self.shell is None:
chebee7i
Default backend is 'agg'. `None` is no matplotlib.
r13873 # We will be here many times. However, when the
# EmbeddedSphinxShell is created, its interactive shell member
# is the same for each instance.
chebee7i
Simplify ipython_directive backend specification.
r13810 if mplbackend:
chebee7i
Make 'matplotlib' optional when using the ipython directive.
r13658 import matplotlib
chebee7i
Fix bug where exec_lines was ignored within ipython directive.
r13674 # Repeated calls to use() will not hurt us since `mplbackend`
# is the same each time.
chebee7i
Make 'matplotlib' optional when using the ipython directive.
r13658 matplotlib.use(mplbackend)
chebee7i
Fix bug where exec_lines was ignored within ipython directive.
r13674 # Must be called after (potentially) importing matplotlib and
# setting its backend since exec_lines might import pylab.
y-p
Remove explicit passing state arg in favor of self.directive.state
r14799 self.shell = EmbeddedSphinxShell(exec_lines)
chebee7i
Fix bug where exec_lines was ignored within ipython directive.
r13674
chebee7i
Provide helpful error messages on doctest failures.
r13863 # Store IPython directive to enable better error messages
self.shell.directive = self
Skipper Seabold
Keep track of seen documents to reset line counts across pages
r6137 # reset the execution count if we haven't processed this doc
#NOTE: this may be borked if there are multiple seen_doc tmp files
#check time stamp?
Ahmet Bakan
Using a class varilable instead of temp files for keeping track of docs....
r10596 if not self.state.document.current_source in self.seen_docs:
chebee7i
Make 'matplotlib' optional when using the ipython directive.
r13658 self.shell.IP.history_manager.reset()
self.shell.IP.execution_count = 1
Joris Van den Bossche
Set prompt_manager.width to zero for each new document to prevent misaligned Out prompts
r13899 self.shell.IP.prompt_manager.width = 0
chebee7i
Make 'matplotlib' optional when using the ipython directive.
r13658 self.seen_docs.add(self.state.document.current_source)
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432
# and attach to shell so we don't have to pass them around
self.shell.rgxin = rgxin
self.shell.rgxout = rgxout
self.shell.promptin = promptin
self.shell.promptout = promptout
self.shell.savefig_dir = savefig_dir
self.shell.source_dir = source_dir
chebee7i
Hold the execution count for @suppress'd inputs.
r13902 self.shell.hold_count = hold_count
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 # setup bookmark for saving figures directory
self.shell.process_input_line('bookmark ipy_savedir %s'%savefig_dir,
store_history=False)
self.shell.clear_cout()
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 return rgxin, rgxout, promptin, promptout
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 def teardown(self):
# delete last bookmark
self.shell.process_input_line('bookmark -d ipy_savedir',
store_history=False)
self.shell.clear_cout()
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 def run(self):
debug = False
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 #TODO, any reason block_parser can't be a method of embeddable shell
# then we wouldn't have to carry these around
rgxin, rgxout, promptin, promptout = self.setup()
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 options = self.options
self.shell.is_suppress = 'suppress' in options
self.shell.is_doctest = 'doctest' in options
self.shell.is_verbatim = 'verbatim' in options
y-p
ipython_directive, report except/warn in block and add :okexcept: :okwarning: options to suppress
r14779 self.shell.is_okexcept = 'okexcept' in options
self.shell.is_okwarning = 'okwarning' in options
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 # handle pure python code
if 'python' in self.arguments:
content = self.content
self.content = self.shell.process_pure_python(content)
parts = '\n'.join(self.content).split('\n\n')
chebee7i
Provide helpful error messages on doctest failures.
r13863 lines = ['.. code-block:: ipython', '']
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 figures = []
for part in parts:
block = block_parser(part, rgxin, rgxout, promptin, promptout)
if len(block):
rows, figure = self.shell.process_block(block)
for row in rows:
chebee7i
Fix submitted output in verbatim mode.
r16646 lines.extend([' {0}'.format(line)
for line in row.split('\n')])
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432
if figure is not None:
figures.append(figure)
for figure in figures:
lines.append('')
lines.extend(figure.split('\n'))
lines.append('')
chebee7i
Fix submitted output in verbatim mode.
r16646 if len(lines) > 2:
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 if debug:
Thomas Kluyver
Convert print statements to print function calls...
r13348 print('\n'.join(lines))
chebee7i
Make 'matplotlib' optional when using the ipython directive.
r13658 else:
chebee7i
Provide helpful error messages on doctest failures.
r13863 # This has to do with input, not output. But if we comment
# these lines out, then no IPython code will appear in the
# final output.
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 self.state_machine.insert_input(
lines, self.state_machine.input_lines.source(0))
# cleanup
self.teardown()
chebee7i
Default backend is 'agg'. `None` is no matplotlib.
r13873 return []
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
# Enable as a proper Sphinx directive
def setup(app):
setup.app = app
MinRK
don't instantiate IPython shell as class attr...
r13150 app.add_directive('ipython', IPythonDirective)
chebee7i
Make 'matplotlib' optional when using the ipython directive.
r13658 app.add_config_value('ipython_savefig_dir', None, 'env')
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 app.add_config_value('ipython_rgxin',
chebee7i
Make 'matplotlib' optional when using the ipython directive.
r13658 re.compile('In \[(\d+)\]:\s?(.*)\s*'), 'env')
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 app.add_config_value('ipython_rgxout',
chebee7i
Make 'matplotlib' optional when using the ipython directive.
r13658 re.compile('Out\[(\d+)\]:\s?(.*)\s*'), 'env')
app.add_config_value('ipython_promptin', 'In [%d]:', 'env')
app.add_config_value('ipython_promptout', 'Out[%d]:', 'env')
chebee7i
Hold the execution count for @suppress'd inputs.
r13902
chebee7i
Default backend is 'agg'. `None` is no matplotlib.
r13873 # We could just let matplotlib pick whatever is specified as the default
# backend in the matplotlibrc file, but this would cause issues if the
# backend didn't work in headless environments. For this reason, 'agg'
# is a good default backend choice.
app.add_config_value('ipython_mplbackend', 'agg', 'env')
chebee7i
Hold the execution count for @suppress'd inputs.
r13902
chebee7i
Default backend is 'agg'. `None` is no matplotlib.
r13873 # If the user sets this config value to `None`, then EmbeddedSphinxShell's
# __init__ method will treat it as [].
execlines = ['import numpy as np', 'import matplotlib.pyplot as plt']
app.add_config_value('ipython_execlines', execlines, 'env')
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
chebee7i
Hold the execution count for @suppress'd inputs.
r13902 app.add_config_value('ipython_holdcount', True, 'env')
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 # Simple smoke test, needs to be converted to a proper automatic test.
def test():
examples = [
r"""
In [9]: pwd
Out[9]: '/home/jdhunter/py4science/book'
In [10]: cd bookdata/
/home/jdhunter/py4science/book/bookdata
In [2]: from pylab import *
In [2]: ion()
In [3]: im = imread('stinkbug.png')
@savefig mystinkbug.png width=4in
In [4]: imshow(im)
Out[4]: <matplotlib.image.AxesImage object at 0x39ea850>
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 """,
r"""
In [1]: x = 'hello world'
# string methods can be
# used to alter the string
@doctest
In [2]: x.upper()
Out[2]: 'HELLO WORLD'
@verbatim
In [3]: x.st<TAB>
x.startswith x.strip
""",
r"""
In [130]: url = 'http://ichart.finance.yahoo.com/table.csv?s=CROX\
.....: &d=9&e=22&f=2009&g=d&a=1&br=8&c=2006&ignore=.csv'
In [131]: print url.split('&')
['http://ichart.finance.yahoo.com/table.csv?s=CROX', 'd=9', 'e=22', 'f=2009', 'g=d', 'a=1', 'b=8', 'c=2006', 'ignore=.csv']
In [60]: import urllib
""",
r"""\
In [133]: import numpy.random
@suppress
In [134]: numpy.random.seed(2358)
@doctest
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 In [135]: numpy.random.rand(10,2)
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 Out[135]:
array([[ 0.64524308, 0.59943846],
[ 0.47102322, 0.8715456 ],
[ 0.29370834, 0.74776844],
[ 0.99539577, 0.1313423 ],
[ 0.16250302, 0.21103583],
[ 0.81626524, 0.1312433 ],
[ 0.67338089, 0.72302393],
[ 0.7566368 , 0.07033696],
[ 0.22591016, 0.77731835],
[ 0.0072729 , 0.34273127]])
""",
r"""
In [106]: print x
jdh
In [109]: for i in range(10):
.....: print i
.....:
.....:
0
1
2
3
4
5
6
7
8
9
""",
r"""
In [144]: from pylab import *
In [145]: ion()
# use a semicolon to suppress the output
@savefig test_hist.png width=4in
In [151]: hist(np.random.randn(10000), 100);
@savefig test_plot.png width=4in
In [151]: plot(np.random.randn(10000), 'o');
""",
r"""
# use a semicolon to suppress the output
In [151]: plt.clf()
@savefig plot_simple.png width=4in
In [151]: plot([1,2,3])
@savefig hist_simple.png width=4in
In [151]: hist(np.random.randn(10000), 100);
""",
r"""
# update the current fig
In [151]: ylabel('number')
In [152]: title('normal distribution')
@savefig hist_with_text.png
In [153]: grid(True)
chebee7i
Add 'float' option to @doctest pseudo-decorator.
r13680 @doctest float
In [154]: 0.1 + 0.2
Out[154]: 0.3
@doctest float
In [155]: np.arange(16).reshape(4,4)
Out[155]:
array([[ 0, 1, 2, 3],
[ 4, 5, 6, 7],
[ 8, 9, 10, 11],
[12, 13, 14, 15]])
In [1]: x = np.arange(16, dtype=float).reshape(4,4)
In [2]: x[0,0] = np.inf
In [3]: x[0,1] = np.nan
@doctest float
In [4]: x
Out[4]:
array([[ inf, nan, 2., 3.],
[ 4., 5., 6., 7.],
[ 8., 9., 10., 11.],
[ 12., 13., 14., 15.]])
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 """,
]
Skipper Seabold
Updated Sphinx extension ipython_directive to work with 0.11.
r4432 # skip local-file depending first example:
examples = examples[1:]
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439
#ipython_directive.DEBUG = True # dbg
#options = dict(suppress=True) # dbg
options = dict()
for example in examples:
content = example.split('\n')
MinRK
don't instantiate IPython shell as class attr...
r13150 IPythonDirective('debug', arguments=None, options=options,
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 content=content, lineno=0,
content_offset=None, block_text=None,
state=None, state_machine=None,
)
# Run test suite as a script
if __name__=='__main__':
if not os.path.isdir('_static'):
os.mkdir('_static')
test()
Thomas Kluyver
Convert print statements to print function calls...
r13348 print('All OK? Check figures in _static/')