sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-01-31 02:01:16 +00:00
Code Issues Releases Wiki Activity

Add ipython version 3 support for the generic ipython support

Browse Source
This commit is contained in:
Javi Merino 2015-04-16 19:24:50 +01:00
parent d12f5c65e1
commit e30386ce4a
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
wlauto/utils/ipython.py
View File

@ -28,20 +28,37 @@ except ImportError as import_error:
else:
import_error_str = import_error.message
# The current code generates notebooks version 3
NBFORMAT_VERSION = 3
if IPython and (IPython.version_info[0] == 2):
import IPython.kernel
import IPython.nbformat.v3
def read_notebook(notebook_in):
return IPython.nbformat.v3.reads_json(notebook_in)
return IPython.nbformat.v3.reads_json(notebook_in) # pylint: disable=E1101
def write_notebook(notebook, fout):
IPython.nbformat.v3.nbjson.JSONWriter().write(notebook, fout)
IPython.nbformat.v3.nbjson.JSONWriter().write(notebook, fout) # pylint: disable=E1101
NotebookNode = IPython.nbformat.v3.NotebookNode
NotebookNode = IPython.nbformat.v3.NotebookNode # pylint: disable=E1101
IPYTHON_NBCONVERT = ['ipython', 'nbconvert', '--to=latex', '--post=PDF']
elif IPython and (IPython.version_info[0] == 3):
import IPython.kernel
import IPython.nbformat
def read_notebook(notebook_in):
return IPython.nbformat.reads(notebook_in, NBFORMAT_VERSION) # pylint: disable=E1101
def write_notebook(notebook, fout):
IPython.nbformat.write(notebook, fout) # pylint: disable=E1101
NotebookNode = IPython.nbformat.NotebookNode # pylint: disable=E1101
IPYTHON_NBCONVERT = ['ipython', 'nbconvert', '--to=pdf']
elif IPython:
# Unsupported IPython version
IPython_ver_str = ".".join([str(n) for n in IPython.version_info])
@ -51,12 +68,20 @@ elif IPython:
def parse_valid_output(msg):
"""Parse a valid result from an execution of a cell in an ipython kernel"""
msg_type = msg["msg_type"]
if msg_type == 'error':
msg_type = 'pyerr'
elif msg_type == 'execute_result':
msg_type = 'pyout'
content = msg["content"]
out = NotebookNode(output_type=msg_type)
if msg_type == "stream":
out.stream = content["name"]
out.text = content["data"]
try:
out.text = content['data']
except KeyError:
out.text = content['text']
elif msg_type in ("display_data", "pyout"):
for mime, data in content["data"].iteritems():
if mime == "text/plain":
@ -86,7 +111,7 @@ def run_cell(kernel_client, cell):
if msg["msg_type"] == "status":
if msg["content"]["execution_state"] == "idle" and input_acknowledged:
break
elif msg["msg_type"] == "pyin":
elif msg["msg_type"] in ('pyin', 'execute_input'):
input_acknowledged = True
else:
out = parse_valid_output(msg)
@ -111,7 +136,7 @@ def run_notebook(notebook):
cell.outputs = run_cell(kernel_client, cell)
cell.prompt_number = prompt_number
if cell.outputs:
if cell.outputs and cell.outputs[0]['output_type'] == 'pyout':
cell.outputs[0]["prompt_number"] = prompt_number
kernel_manager.shutdown_kernel()