s/prompt_number/execution_count in nbformat 4

IPython/html/nbconvert/tests/test_nbconvert_handlers.py

@@ -60,7 +60,7 b' class APITest(NotebookTestBase):'
         cc1.outputs.append(new_output(output_type="stream", data=u'12'))
         cc1.outputs.append(new_output(output_type="execute_result",
             mime_bundle={'image/png' : png_green_pixel},
-            prompt_number=1,
+            execution_count=1,
         ))
         nb.cells.append(cc1)
         

IPython/html/static/notebook/js/codecell.js

@@ -471,7 +471,7 b' define(['
                 this.code_mirror.clearHistory();
                 this.auto_highlight();
             }
-            this.set_input_prompt(data.prompt_number);
+            this.set_input_prompt(data.execution_count);
             this.output_area.trusted = data.metadata.trusted || false;
             this.output_area.fromJSON(data.outputs);
             if (data.metadata.collapsed !== undefined) {
@@ -490,9 +490,9 b' define(['
         data.source = this.get_text();
         // is finite protect against undefined and '*' value
         if (isFinite(this.input_prompt_number)) {
-            data.prompt_number = this.input_prompt_number;
+            data.execution_count = this.input_prompt_number;
         } else {
-            data.prompt_number = null;
+            data.execution_count = null;
         }
         var outputs = this.output_area.toJSON();
         data.outputs = outputs;

IPython/html/static/notebook/js/outputarea.js

@@ -220,7 +220,7 b' define(['
             json = content.data;
             json.output_type = msg_type;
             json.metadata = content.metadata;
-            json.prompt_number = content.execution_count;
+            json.execution_count = content.execution_count;
         } else if (msg_type === "error") {
             json.ename = content.ename;
             json.evalue = content.evalue;
@@ -414,7 +414,7 b' define(['
 
 
     OutputArea.prototype.append_execute_result = function (json) {
-        var n = json.prompt_number || ' ';
+        var n = json.execution_count || ' ';
         var toinsert = this.create_output_area();
         if (this.prompt_area) {
             toinsert.find('div.prompt').addClass('output_prompt').text('Out[' + n + ']:');

IPython/html/tests/notebook/inject_js.js

@@ -13,7 +13,7 b' casper.notebook_test(function () {'
     this.evaluate(function () {
         var cell = IPython.notebook.get_cell(0);
         var json = cell.toJSON();
-        json.prompt_number = "<script> alert('hello from input prompts !')</script>";
+        json.execution_count = "<script> alert('hello from input prompts !')</script>";
         cell.fromJSON(json);
     });
 

IPython/nbconvert/exporters/tests/files/notebook2.ipynb

@@ -17,6 +17,7 b''
   },
   {
    "cell_type": "code",
+   "execution_count": 1,
    "metadata": {
     "collapsed": false
    },
@@ -28,18 +29,17 b''
      "text": "\nWelcome to pylab, a matplotlib-based Python environment [backend: module://IPython.kernel.zmq.pylab.backend_inline].\nFor more information, type 'help(pylab)'.\n"
     }
    ],
-   "prompt_number": 1,
    "source": [
     "%pylab inline"
    ]
   },
   {
    "cell_type": "code",
+   "execution_count": 2,
    "metadata": {
     "collapsed": false
    },
    "outputs": [],
-   "prompt_number": 2,
    "source": [
     "import numpy as np"
    ]
@@ -53,62 +53,62 b''
   },
   {
    "cell_type": "code",
+   "execution_count": 6,
    "metadata": {
     "collapsed": false
    },
    "outputs": [],
-   "prompt_number": 6,
    "source": [
     "a = np.random.uniform(size=(100,100))"
    ]
   },
   {
    "cell_type": "code",
+   "execution_count": 7,
    "metadata": {
     "collapsed": false
    },
    "outputs": [
     {
+     "execution_count": 7,
      "metadata": {},
      "output_type": "execute_result",
-     "prompt_number": 7,
      "text/plain": [
       "(100, 100)"
      ]
     }
    ],
-   "prompt_number": 7,
    "source": [
     "a.shape"
    ]
   },
   {
    "cell_type": "code",
+   "execution_count": 8,
    "metadata": {
     "collapsed": false
    },
    "outputs": [],
-   "prompt_number": 8,
    "source": [
     "evs = np.linalg.eigvals(a)"
    ]
   },
   {
    "cell_type": "code",
+   "execution_count": 10,
    "metadata": {
     "collapsed": false
    },
    "outputs": [
     {
+     "execution_count": 10,
      "metadata": {},
      "output_type": "execute_result",
-     "prompt_number": 10,
      "text/plain": [
       "(100,)"
      ]
     }
    ],
-   "prompt_number": 10,
    "source": [
     "evs.shape"
    ]
@@ -122,14 +122,15 b''
   },
   {
    "cell_type": "code",
+   "execution_count": 14,
    "metadata": {
     "collapsed": false
    },
    "outputs": [
     {
+     "execution_count": 14,
      "metadata": {},
      "output_type": "execute_result",
-     "prompt_number": 14,
      "text/plain": [
       "(array([95,  4,  0,  0,  0,  0,  0,  0,  0,  1]),\n",
       " array([ -2.93566063,   2.35937011,   7.65440086,  12.9494316 ,\n",
@@ -147,18 +148,17 b''
      ]
     }
    ],
-   "prompt_number": 14,
    "source": [
     "hist(evs.real)"
    ]
   },
   {
    "cell_type": "code",
+   "execution_count": null,
    "metadata": {
     "collapsed": false
    },
    "outputs": [],
-   "prompt_number": null,
    "source": []
   }
  ],

IPython/nbconvert/preprocessors/clearoutput.py

@@ -3,16 +3,8 b''
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-#-----------------------------------------------------------------------------
-# Imports
-#-----------------------------------------------------------------------------
-
 from .base import Preprocessor
 
-
-#-----------------------------------------------------------------------------
-# Classes
-#-----------------------------------------------------------------------------
 class ClearOutputPreprocessor(Preprocessor):
     """
     Removes the output from all code cells in a notebook.
@@ -24,5 +16,5 b' class ClearOutputPreprocessor(Preprocessor):'
         """
         if cell.cell_type == 'code':
             cell.outputs = []
-            cell.prompt_number = None
+            cell.execution_count = None
         return cell, resources

IPython/nbconvert/preprocessors/execute.py

@@ -88,8 +88,7 b' class ExecutePreprocessor(Preprocessor):'
 
             # set the prompt number for the input and the output
             if 'execution_count' in content:
-                cell['prompt_number'] = content['execution_count']
-                out.prompt_number = content['execution_count']
+                cell['execution_count'] = content['execution_count']
 
             if msg_type == 'status':
                 if content['execution_state'] == 'idle':
@@ -101,8 +100,6 b' class ExecutePreprocessor(Preprocessor):'
             elif msg_type == 'clear_output':
                 outs = []
                 continue
-            elif msg_type == 'execute_result':
-                cell['prompt_number'] = content['execution_count']
 
             try:
                 out = output_from_msg(msg)

IPython/nbconvert/preprocessors/tests/base.py

@@ -27,7 +27,7 b' class PreprocessorTestsBase(TestsBase):'
         out['application/pdf'] = 'aA=='
         outputs.append(out)
         
-        cells=[nbformat.new_code_cell(source="$ e $", prompt_number=1, outputs=outputs),
+        cells=[nbformat.new_code_cell(source="$ e $", execution_count=1, outputs=outputs),
                nbformat.new_markdown_cell(source="$ e $")]
 
         return nbformat.new_notebook(cells=cells)

IPython/nbconvert/preprocessors/tests/files/Clear Output.ipynb

@@ -2,17 +2,18 b''
  "cells": [
   {
    "cell_type": "code",
+   "execution_count": 1,
    "metadata": {
     "collapsed": false
    },
    "outputs": [],
-   "prompt_number": 1,
    "source": [
     "from IPython.display import clear_output"
    ]
   },
   {
    "cell_type": "code",
+   "execution_count": 2,
    "metadata": {
     "collapsed": false
    },
@@ -24,7 +25,6 b''
      "text": "9\n"
     }
    ],
-   "prompt_number": 2,
    "source": [
     "for i in range(10):\n",
     "    clear_output()\n",

IPython/nbconvert/preprocessors/tests/files/Factorials.ipynb

@@ -2,17 +2,18 b''
  "cells": [
   {
    "cell_type": "code",
+   "execution_count": 1,
    "metadata": {
     "collapsed": false
    },
    "outputs": [],
-   "prompt_number": 1,
    "source": [
     "i, j = 1, 1"
    ]
   },
   {
    "cell_type": "code",
+   "execution_count": 2,
    "metadata": {
     "collapsed": false
    },
@@ -24,7 +25,6 b''
      "text": "2\n3\n5\n8\n13\n21\n34\n55\n89\n144\n"
     }
    ],
-   "prompt_number": 2,
    "source": [
     "for m in range(10):\n",
     "    i, j = j, i + j\n",

IPython/nbconvert/preprocessors/tests/files/HelloWorld.ipynb

@@ -2,6 +2,7 b''
  "cells": [
   {
    "cell_type": "code",
+   "execution_count": 1,
    "metadata": {
     "collapsed": false
    },
@@ -13,7 +14,6 b''
      "text": "Hello World\n"
     }
    ],
-   "prompt_number": 1,
    "source": [
     "print(\"Hello World\")"
    ]

IPython/nbconvert/preprocessors/tests/files/Inline Image.ipynb

@@ -2,22 +2,22 b''
  "cells": [
   {
    "cell_type": "code",
+   "execution_count": 1,
    "metadata": {
     "collapsed": false
    },
    "outputs": [],
-   "prompt_number": 1,
    "source": [
     "from IPython.display import Image"
    ]
   },
   {
    "cell_type": "code",
+   "execution_count": 2,
    "metadata": {
     "collapsed": false
    },
    "outputs": [],
-   "prompt_number": 2,
    "source": [
     "Image('../input/python.png');"
    ]

IPython/nbconvert/preprocessors/tests/files/SVG.ipynb

@@ -2,22 +2,24 b''
  "cells": [
   {
    "cell_type": "code",
+   "execution_count": 1,
    "metadata": {
     "collapsed": false
    },
    "outputs": [],
-   "prompt_number": 1,
    "source": [
     "from IPython.display import SVG"
    ]
   },
   {
    "cell_type": "code",
+   "execution_count": 2,
    "metadata": {
     "collapsed": false
    },
    "outputs": [
     {
+     "execution_count": 2,
      "image/svg+xml": [
       "<svg height=\"100\" width=\"100\">\n",
       "    <circle cx=\"50\" cy=\"50\" fill=\"red\" r=\"40\" stroke=\"black\" stroke-width=\"2\"/>\n",
@@ -25,13 +27,11 b''
      ],
      "metadata": {},
      "output_type": "execute_result",
-     "prompt_number": 2,
      "text/plain": [
       "<IPython.core.display.SVG object>"
      ]
     }
    ],
-   "prompt_number": 2,
    "source": [
     "SVG(data='''\n",
     "<svg height=\"100\" width=\"100\">\n",

IPython/nbconvert/preprocessors/tests/files/Skip Exceptions.ipynb

@@ -2,6 +2,7 b''
  "cells": [
   {
    "cell_type": "code",
+   "execution_count": 1,
    "metadata": {
     "collapsed": false
    },
@@ -19,13 +20,13 b''
      ]
     }
    ],
-   "prompt_number": 1,
    "source": [
     "raise Exception(\"message\")"
    ]
   },
   {
    "cell_type": "code",
+   "execution_count": 2,
    "metadata": {
     "collapsed": false
    },
@@ -37,7 +38,6 b''
      "text": "ok\n"
     }
    ],
-   "prompt_number": 2,
    "source": [
     "print('ok')"
    ]

IPython/nbconvert/preprocessors/tests/files/Unicode.ipynb

@@ -2,6 +2,7 b''
  "cells": [
   {
    "cell_type": "code",
+   "execution_count": 1,
    "metadata": {
     "collapsed": false
    },
@@ -13,7 +14,6 b''
      "text": "\u2603\n"
     }
    ],
-   "prompt_number": 1,
    "source": [
     "print('\u2603')"
    ]

IPython/nbconvert/preprocessors/tests/test_clearoutput.py

@@ -32,4 +32,4 b' class TestClearOutput(PreprocessorTestsBase):'
         preprocessor = self.build_preprocessor()
         nb, res = preprocessor(nb, res)
         assert nb.cells[0].outputs == []
-        assert nb.cells[0].prompt_number is None
+        assert nb.cells[0].execution_count is None

IPython/nbconvert/preprocessors/tests/test_coalescestreams.py

@@ -33,7 +33,7 b' class TestCoalesceStreams(PreprocessorTestsBase):'
                    nbformat.new_output(output_type="stream", name="stdout", text="5"),
                    nbformat.new_output(output_type="stream", name="stdout", text="6"),
                    nbformat.new_output(output_type="stream", name="stdout", text="7")]
-        cells=[nbformat.new_code_cell(source="# None", prompt_number=1,outputs=outputs)]
+        cells=[nbformat.new_code_cell(source="# None", execution_count=1,outputs=outputs)]
 
         nb = nbformat.new_notebook(cells=cells)
         res = self.build_resources()
@@ -49,7 +49,7 b' class TestCoalesceStreams(PreprocessorTestsBase):'
                    nbformat.new_output(output_type="stream", name="stdout", text="\nz"),
                    nbformat.new_output(output_type="stream", name="stdout", text="\rc\n"),
                    nbformat.new_output(output_type="stream", name="stdout", text="z\rz\rd")]
-        cells=[nbformat.new_code_cell(source="# None", prompt_number=1,outputs=outputs)]
+        cells=[nbformat.new_code_cell(source="# None", execution_count=1,outputs=outputs)]
 
         nb = nbformat.new_notebook(cells=cells)
         res = self.build_resources()

IPython/nbconvert/preprocessors/tests/test_execute.py

@@ -53,9 +53,9 b' class TestExecute(PreprocessorTestsBase):'
             normalized_actual_outputs = list(map(self.normalize_output, actual_outputs))
             assert normalized_expected_outputs == normalized_actual_outputs
 
-            expected_prompt_number = expected_cell.get('prompt_number', None)
-            actual_prompt_number = actual_cell.get('prompt_number', None)
-            assert expected_prompt_number == actual_prompt_number
+            expected_execution_count = expected_cell.get('execution_count', None)
+            actual_execution_count = actual_cell.get('execution_count', None)
+            assert expected_execution_count == actual_execution_count
 
 
     def build_preprocessor(self):
@@ -81,8 +81,8 b' class TestExecute(PreprocessorTestsBase):'
             preprocessor = self.build_preprocessor()
             cleaned_input_nb = copy.deepcopy(input_nb)
             for cell in cleaned_input_nb.cells:
-                if 'prompt_number' in cell:
-                    del cell['prompt_number']
+                if 'execution_count' in cell:
+                    del cell['execution_count']
                 cell['outputs'] = []
             output_nb, _ = preprocessor(cleaned_input_nb, res)
             self.assert_notebooks_equal(output_nb, input_nb)

IPython/nbconvert/preprocessors/tests/test_revealhelp.py

@@ -21,9 +21,9 b' class Testrevealhelp(PreprocessorTestsBase):'
         slide_metadata = {'slideshow' : {'slide_type': 'slide'}}
         subslide_metadata = {'slideshow' : {'slide_type': 'subslide'}}
 
-        cells=[nbformat.new_code_cell(source="", prompt_number=1, outputs=outputs),
+        cells=[nbformat.new_code_cell(source="", execution_count=1, outputs=outputs),
                nbformat.new_markdown_cell(source="", metadata=slide_metadata),
-               nbformat.new_code_cell(source="", prompt_number=2, outputs=outputs),
+               nbformat.new_code_cell(source="", execution_count=2, outputs=outputs),
                nbformat.new_markdown_cell(source="", metadata=slide_metadata),
                nbformat.new_markdown_cell(source="", metadata=subslide_metadata)]
 

IPython/nbconvert/preprocessors/tests/test_svg2pdf.py

@@ -47,7 +47,7 b' class Testsvg2pdf(PreprocessorTestsBase):'
         slide_metadata = {'slideshow' : {'slide_type': 'slide'}}
         subslide_metadata = {'slideshow' : {'slide_type': 'subslide'}}
 
-        cells=[nbformat.new_code_cell(source="", prompt_number=1, outputs=outputs)]
+        cells=[nbformat.new_code_cell(source="", execution_count=1, outputs=outputs)]
 
         return nbformat.new_notebook(cells=cells)
 

IPython/nbconvert/templates/html/basic.tpl

@@ -23,8 +23,8 b''
 
 {% block in_prompt -%}
 <div class="prompt input_prompt">
-{%- if cell.prompt_number is defined -%}
-In&nbsp;[{{ cell.prompt_number|replace(None, "&nbsp;") }}]:
+{%- if cell.execution_count is defined -%}
+In&nbsp;[{{ cell.execution_count|replace(None, "&nbsp;") }}]:
 {%- else -%}
 In&nbsp;[&nbsp;]:
 {%- endif -%}
@@ -55,8 +55,8 b' In&nbsp;[&nbsp;]:'
 <div class="output_area">
 {%- if output.output_type == 'execute_result' -%}
     <div class="prompt output_prompt">
-{%- if cell.prompt_number is defined -%}
-    Out[{{ cell.prompt_number|replace(None, "&nbsp;") }}]:
+{%- if cell.execution_count is defined -%}
+    Out[{{ cell.execution_count|replace(None, "&nbsp;") }}]:
 {%- else -%}
     Out[&nbsp;]:
 {%- endif -%}

IPython/nbconvert/templates/latex/style_bw_ipython.tplx

@@ -20,7 +20,7 b''
         ((*- if type in ['text']*))
 ((( add_prompt(output.text, cell, 'Out') )))
         ((*- else -*))
-\verb+Out[((( cell.prompt_number )))]:+((( super() )))
+\verb+Out[((( cell.execution_count )))]:+((( super() )))
         ((*- endif -*))
     ((*- endfor -*))
 ((* endblock execute_result *))
@@ -33,13 +33,13 b''
 % Name: draw_prompt
 % Purpose: Renders an output/input prompt
 ((* macro add_prompt(text, cell, prompt) -*))
-    ((*- if cell.prompt_number is defined -*))
-    ((*- set prompt_number = "" ~ (cell.prompt_number | replace(None, " ")) -*))
+    ((*- if cell.execution_count is defined -*))
+    ((*- set execution_count = "" ~ (cell.execution_count | replace(None, " ")) -*))
     ((*- else -*))
-    ((*- set prompt_number = " " -*))
+    ((*- set execution_count = " " -*))
     ((*- endif -*))
-    ((*- set indentation = " " * (prompt_number | length + 7) -*))
+    ((*- set indentation = " " * (execution_count | length + 7) -*))
 \begin{verbatim}
-(((- text | add_prompts(first=prompt ~ '[' ~ prompt_number ~ ']: ', cont=indentation) -)))
+(((- text | add_prompts(first=prompt ~ '[' ~ execution_count ~ ']: ', cont=indentation) -)))
 \end{verbatim}
 ((*- endmacro *))

IPython/nbconvert/templates/latex/style_ipython.tplx

@@ -33,7 +33,7 b''
         ((*- if type in ['text']*))
             ((( add_prompt(output.text | escape_latex, cell, 'Out', 'outcolor') )))
         ((* else -*))
-\texttt{\color{outcolor}Out[{\color{outcolor}((( cell.prompt_number )))}]:}((( super() )))
+\texttt{\color{outcolor}Out[{\color{outcolor}((( cell.execution_count )))}]:}((( super() )))
         ((*- endif -*))
     ((*- endfor -*))
 ((* endblock execute_result *))
@@ -46,13 +46,13 b''
 % Name: draw_prompt
 % Purpose: Renders an output/input prompt
 ((* macro add_prompt(text, cell, prompt, prompt_color) -*))
-    ((*- if cell.prompt_number is defined -*))
-    ((*- set prompt_number = "" ~ (cell.prompt_number | replace(None, " ")) -*))
+    ((*- if cell.execution_count is defined -*))
+    ((*- set execution_count = "" ~ (cell.execution_count | replace(None, " ")) -*))
     ((*- else -*))
-    ((*- set prompt_number = " " -*))
+    ((*- set execution_count = " " -*))
     ((*- endif -*))
-    ((*- set indention =  " " * (prompt_number | length + 7) -*))
+    ((*- set indention =  " " * (execution_count | length + 7) -*))
 \begin{Verbatim}[commandchars=\\\{\}]
-((( text | add_prompts(first='{\color{' ~ prompt_color ~ '}' ~ prompt ~ '[{\\color{' ~ prompt_color ~ '}' ~ prompt_number ~ '}]:} ', cont=indention) )))
+((( text | add_prompts(first='{\color{' ~ prompt_color ~ '}' ~ prompt ~ '[{\\color{' ~ prompt_color ~ '}' ~ execution_count ~ '}]:} ', cont=indention) )))
 \end{Verbatim}
 ((*- endmacro *))

IPython/nbconvert/templates/python.tpl

@@ -5,7 +5,7 b''
 {% endblock header %}
 
 {% block in_prompt %}
-# In[{{ cell.prompt_number if cell.prompt_number else ' ' }}]:
+# In[{{ cell.execution_count if cell.execution_count else ' ' }}]:
 {% endblock in_prompt %}
 
 {% block input %}

IPython/nbconvert/tests/files/notebook1.ipynb

@@ -17,11 +17,11 b''
   },
   {
    "cell_type": "code",
+   "execution_count": 2,
    "metadata": {
     "collapsed": false
    },
    "outputs": [],
-   "prompt_number": 2,
    "source": [
     "from sympy import init_printing\n",
     "from sympy import *\n",
@@ -37,11 +37,11 b''
   },
   {
    "cell_type": "code",
+   "execution_count": 4,
    "metadata": {
     "collapsed": false
    },
    "outputs": [],
-   "prompt_number": 4,
    "source": [
     "x,y,z = symbols('x y z')"
    ]
@@ -55,15 +55,16 b''
   },
   {
    "cell_type": "code",
+   "execution_count": 6,
    "metadata": {
     "collapsed": false
    },
    "outputs": [
     {
+     "execution_count": 6,
      "image/png": "iVBORw0KGgoAAAANSUhEUgAAAKMAAAAZBAMAAACvE4OgAAAAMFBMVEX///8AAAAAAAAAAAAAAAAA\nAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAv3aB7AAAAD3RSTlMAEHarIkSJZt3NVLsy\nme8Q6PJIAAACz0lEQVRIDa1UTWjUQBT+ZpvdzW7TGlrxItjYSg/C6vbiDwjmoCgUpHioPYhdqig9\nFJYiPYmW4klB14NgFGnw4EHpj7UgUtTFXhSEBgVBxIOFggWVrrUqiMY3mZkkLNIK7oN575vvvfky\n8yYJIGzgkSlRrULKrivVSkvq6LbxtcaSjV3aSo0lgWyl5pK69V+SRlEsPxNTGYhhDrV3M2Ue2etc\nEDmuMmM+IjolrCuHXNoLoQDNSAXdzbjsfFVKTY1vCgFXFIxenG4cFSSzRewAPnN0FugXjPDr45MQ\nJwoKtitgXL9zT+CsJeIHYG+Z4H1gwhRU4G/FcAQbbYU3KdDo+0sCK8lRU0guA72uKqMYk9RehHxP\niDIu0NS2v90KGShJYi7T7tgvkrQ2vIT2XtRISWNra6lzGc8/PW3ji4PL7Vmge095YIX0iB71NCaZ\n5N3XyM0VCuNIyFNIyY3AMG/KDUvjn90DGmwq9wpIl5AyU5WsTYy0aJf6JFGB5An3Der5jExKHjNR\n4JKPge/EXqDBoOXpkxkmkJHFfAFRVhDIveWA0S57N2Me6yw+DSX1n1uCq3sIfCF2IcjNkjeWyKli\nginHubboOB4vSNAjyaiXE26ygrkyTfod55Lj3CTE+n2P73ImJpnk6wJJKjYJSwt3OQbNJu4icM5s\nKGGbzMuD70N6JSbJD44x7pLDyJrbkfiLpOEhYVMJSVEj83x5YFLyNrAzJsmvJ+uhLrieXvcJDshy\nHtQuD54c2IWWEnSXfUTDZJJfAjcpOW5imp9aHvw4ZZ4NDV4FGjw0tzadKgbFwinJUd//AT0P1tdW\nBtuRU39oKdk9ONQ163fM+nvu/s4D/FX30otdQIZGlSnJKpq6KUxKVqV1WxGHFIhishjhEO1Gi3r4\nkZCMg+hH1henV8EjmFoly1PTMs/Uadaox+FceY2STpmvt9co/Pe0Jvt1GvgDK/Osw/4jQ4wAAAAA\nSUVORK5CYII=\n",
      "metadata": {},
      "output_type": "execute_result",
-     "prompt_number": 6,
      "text/latex": [
       "$$x^{2} + 2.0 y + \\sin{\\left (z \\right )}$$"
      ],
@@ -73,22 +74,22 b''
      ]
     }
    ],
-   "prompt_number": 6,
    "source": [
     "e = x**2 + 2.0*y + sin(z); e"
    ]
   },
   {
    "cell_type": "code",
+   "execution_count": 7,
    "metadata": {
     "collapsed": false
    },
    "outputs": [
     {
+     "execution_count": 7,
      "image/png": "iVBORw0KGgoAAAANSUhEUgAAABQAAAAOBAMAAADd6iHDAAAAMFBMVEX///8AAAAAAAAAAAAAAAAA\nAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAv3aB7AAAAD3RSTlMAIpm7MhCriUTv3c12\nVGZoascqAAAAgElEQVQIHWNgVDJ2YICAMAb2H1BmKgPDTChzFgNDvgOEvT8AzgQKrA9gPZPYUwNk\ncXxnCGd4dWA1kMllwFDKUB9wEchUZmAIYNgMZDDwJIDIPyDiEgOjAAPLFwZWBhYFBh6BqzwfGI4y\nSJUXZXH8Zf7A+IBh////v1hzjh5/xwAAW80hUDE8HYkAAAAASUVORK5CYII=\n",
      "metadata": {},
      "output_type": "execute_result",
-     "prompt_number": 7,
      "text/latex": [
       "$$2 x$$"
      ],
@@ -97,22 +98,22 b''
      ]
     }
    ],
-   "prompt_number": 7,
    "source": [
     "diff(e, x)"
    ]
   },
   {
    "cell_type": "code",
+   "execution_count": 8,
    "metadata": {
     "collapsed": false
    },
    "outputs": [
     {
+     "execution_count": 8,
      "image/png": "iVBORw0KGgoAAAANSUhEUgAAALsAAAAZBAMAAACbakK8AAAAMFBMVEX///8AAAAAAAAAAAAAAAAA\nAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAv3aB7AAAAD3RSTlMAEHarIkSJZt3NVLsy\nme8Q6PJIAAADAklEQVRIDbVVS2gTURQ90/wmk0k6tCJCsR1SKShIsxE3CgNWBKUxq9qFmqFqShfF\nUKQrkaDiF0pcCKYgBBcuBLV+wIWKARe6kQ4UhNKKWdiF4KIptmA/xPvmzZuMxdYUzIPcd+655568\nvLlJAL6G32oOasQWNHz5Rvg6nrKh/mygfSzlX2ygPaBUGmov6//NXs1yq4sex2EPrsHemTd2snNg\ntkb+Cx1zBL6SqwxZLvQAKYHzKZaPY4fh4TeHd0S5Nox9OClItm/jiU9DrEwwVEawpiVis9VkimqX\nAOr4o2cCs/0BT2I5+FYJRhJbePQxgzcD7QLEqtV5gdnu2Icr3L45gcCyt74Z7neL4SLQ0nm4S+dM\nYCz1gSPHnhKZDWyHhcCCNKwjqaF/TkwGl0L6nClie/wc1D1xdoNsSLhT0IJkhi7Lzr22xb8keE/N\nPm0Sc9yEuhRUyuiG9HzvFNeImCyq39SriOhtQI7IV/TiTqE8glqwohjE0NJwiANxOZTdZoxtfzSa\nx2tI8DtHcKQoQFmV6f1XT2swibxFL+6k5EgenhBCqKLTPX3ULnaYdDlaTMcCSd8zuXTvBq2bJUJr\nlE4WgSV5ZRdBzLFgO6nzhJp1ltvrlB2HCoWxQuG+jTvt2GxBWUZaU2mMApZNuSHA3vJpCliRhqqs\nZtvbTrb9ZIk+i70Ut1OcnpgeKskTCFUwjaYy8Jhr3eiefq0HIfa7yC6HOwVyULRuNDn21JngbcL+\nE8A+MNnSxb+w59+Cj2tELJBbjEZr8SGwn0j2aLkTPdp08R2OcKV6fXB3ikPH3n8tM5WTfrETtZcw\ng3QWH0dH7nKNiMkszqo/EDafaHhJ5Bm6ee4UtdAabxnMcmUUl0SnYx+uVqs5XAGN9QGgdeCrASv0\n3TmCsJcOdhnozexD38goK9HXynEKr1OKDs9guhQD039kGySyIQpJAdbvJ9YTlPvyUl3/aLUf34G/\nuGxIyXpE37DoLbAHwJaU53t9MRCfrU8o/k4iRn36Lar8Wd5wAfgN4R6xelyy/ssAAAAASUVORK5C\nYII=\n",
      "metadata": {},
      "output_type": "execute_result",
-     "prompt_number": 8,
      "text/latex": [
       "$$x^{2} z + 2.0 y z - \\cos{\\left (z \\right )}$$"
      ],
@@ -122,18 +123,17 b''
      ]
     }
    ],
-   "prompt_number": 8,
    "source": [
     "integrate(e, z)"
    ]
   },
   {
    "cell_type": "code",
+   "execution_count": null,
    "metadata": {
     "collapsed": false
    },
    "outputs": [],
-   "prompt_number": null,
    "source": []
   }
  ],

IPython/nbconvert/tests/files/notebook2.ipynb

@@ -17,6 +17,7 b''
   },
   {
    "cell_type": "code",
+   "execution_count": 1,
    "metadata": {
     "collapsed": false
    },
@@ -28,7 +29,6 b''
      "text": "module://IPython.kernel.zmq.pylab.backend_inline\n"
     }
    ],
-   "prompt_number": 1,
    "source": [
     "%matplotlib inline\n",
     "import matplotlib\n",
@@ -38,11 +38,11 b''
   },
   {
    "cell_type": "code",
+   "execution_count": 2,
    "metadata": {
     "collapsed": false
    },
    "outputs": [],
-   "prompt_number": 2,
    "source": [
     "from IPython.display import set_matplotlib_formats\n",
     "set_matplotlib_formats('png', 'pdf')\n",
@@ -51,31 +51,31 b''
   },
   {
    "cell_type": "code",
+   "execution_count": 3,
    "metadata": {
     "collapsed": false
    },
    "outputs": [
     {
+     "execution_count": 3,
      "metadata": {},
      "output_type": "execute_result",
-     "prompt_number": 3,
      "text/plain": [
       "{matplotlib.figure.Figure: <function IPython.core.pylabtools.<lambda>>}"
      ]
     }
    ],
-   "prompt_number": 3,
    "source": [
     "ip.display_formatter.formatters['application/pdf'].type_printers"
    ]
   },
   {
    "cell_type": "code",
+   "execution_count": 4,
    "metadata": {
     "collapsed": false
    },
    "outputs": [],
-   "prompt_number": 4,
    "source": [
     "import numpy as np"
    ]
@@ -89,62 +89,62 b''
   },
   {
    "cell_type": "code",
+   "execution_count": 5,
    "metadata": {
     "collapsed": false
    },
    "outputs": [],
-   "prompt_number": 5,
    "source": [
     "a = np.random.uniform(size=(100,100))"
    ]
   },
   {
    "cell_type": "code",
+   "execution_count": 6,
    "metadata": {
     "collapsed": false
    },
    "outputs": [
     {
+     "execution_count": 6,
      "metadata": {},
      "output_type": "execute_result",
-     "prompt_number": 6,
      "text/plain": [
       "(100, 100)"
      ]
     }
    ],
-   "prompt_number": 6,
    "source": [
     "a.shape"
    ]
   },
   {
    "cell_type": "code",
+   "execution_count": 7,
    "metadata": {
     "collapsed": false
    },
    "outputs": [],
-   "prompt_number": 7,
    "source": [
     "evs = np.linalg.eigvals(a)"
    ]
   },
   {
    "cell_type": "code",
+   "execution_count": 8,
    "metadata": {
     "collapsed": false
    },
    "outputs": [
     {
+     "execution_count": 8,
      "metadata": {},
      "output_type": "execute_result",
-     "prompt_number": 8,
      "text/plain": [
       "(100,)"
      ]
     }
    ],
-   "prompt_number": 8,
    "source": [
     "evs.shape"
    ]
@@ -166,14 +166,15 b''
   },
   {
    "cell_type": "code",
+   "execution_count": 9,
    "metadata": {
     "collapsed": false
    },
    "outputs": [
     {
+     "execution_count": 9,
      "metadata": {},
      "output_type": "execute_result",
-     "prompt_number": 9,
      "text/plain": [
       "(array([97,  2,  0,  0,  0,  0,  0,  0,  0,  1]),\n",
       " array([ -2.59479443,   2.67371141,   7.94221725,  13.21072308,\n",
@@ -192,7 +193,6 b''
      ]
     }
    ],
-   "prompt_number": 9,
    "source": [
     "plt.hist(evs.real)"
    ]

IPython/nbformat/sign.py

@@ -211,7 +211,7 b' class NotebookNotary(LoggingConfigurable):'
             output_type = output['output_type']
             if output_type in {'execute_result', 'display_data'}:
                 # if there are any data keys not in the safe whitelist
-                output_keys = set(output).difference({"output_type", "prompt_number", "metadata"})
+                output_keys = set(output).difference({"output_type", "execution_count", "metadata"})
                 if output_keys.difference(safe):
                     return False
         

IPython/nbformat/tests/test4.ipynb

@@ -52,7 +52,7 b''
                     ]
                 }
             ],
-            "prompt_number": 1
+            "execution_count": 1
         },
         {
             "cell_type": "heading",
@@ -88,13 +88,13 b''
                     ],
                     "metadata": {},
                     "output_type": "execute_result",
-                    "prompt_number": 3,
+                    "execution_count": 3,
                     "text/plain": [
                         "<IPython.core.display.HTML at 0x1112757d0>"
                     ]
                 }
             ],
-            "prompt_number": 3
+            "execution_count": 3
         },
         {
             "cell_type": "code",
@@ -118,7 +118,7 b''
                     ]
                 }
             ],
-            "prompt_number": 7
+            "execution_count": 7
         },
         {
             "cell_type": "heading",
@@ -143,13 +143,13 b''
                     "metadata": {},
                     "output_type": "execute_result",
                     "image/png": "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\n",
-                    "prompt_number": 6,
+                    "execution_count": 6,
                     "text/plain": [
                         "<IPython.core.display.Image at 0x111275490>"
                     ]
                 }
             ],
-            "prompt_number": 6
+            "execution_count": 6
         }
     ]
 }

IPython/nbformat/v4/convert.py

@@ -75,6 +75,7 b' def upgrade_cell(cell):'
     code cell:
         - remove language metadata
         - cell.input -> cell.source
+        - cell.prompt_number -> cell.execution_count
         - update outputs
     """
     cell.setdefault('metadata', NotebookNode())
@@ -82,7 +83,7 b' def upgrade_cell(cell):'
         cell.pop('language', '')
         cell.metadata.collapsed = cell.pop('collapsed')
         cell.source = cell.pop('input')
-        cell.setdefault('prompt_number', None)
+        cell.execution_count = cell.pop('prompt_number', None)
         cell.outputs = upgrade_outputs(cell.outputs)
     elif cell.cell_type == 'html':
         # Technically, this exists. It will never happen in practice.
@@ -90,9 +91,18 b' def upgrade_cell(cell):'
     return cell
 
 def downgrade_cell(cell):
+    """downgrade a cell from v4 to v3
+
+    code cell:
+        - set cell.language
+        - cell.input <- cell.source
+        - cell.prompt_number <- cell.execution_count
+        - update outputs
+    """
     if cell.cell_type == 'code':
         cell.language = 'python'
         cell.input = cell.pop('source', '')
+        cell.prompt_number = cell.pop('execution_count', None)
         cell.collapsed = cell.metadata.pop('collapsed', False)
         cell.outputs = downgrade_outputs(cell.outputs)
     return cell
@@ -134,6 +144,7 b' def upgrade_output(output):'
     if output['output_type'] in {'pyout', 'display_data'}:
         if output['output_type'] == 'pyout':
             output['output_type'] = 'execute_result'
+            output['execution_count'] = output.pop('prompt_number', None)
         to_mime_key(output)
         to_mime_key(output.metadata)
         if 'application/json' in output:
@@ -158,6 +169,7 b' def downgrade_output(output):'
     """
     if output['output_type'] == 'execute_result':
         output['output_type'] = 'pyout'
+        output['prompt_number'] = output.pop('execution_count', None)
         if 'application/json' in output:
             output['application/json'] = json.dumps(output['application/json'])
         from_mime_key(output)

IPython/nbformat/v4/nbbase.py

@@ -74,7 +74,7 b' def output_from_msg(msg):'
         return new_output(output_type=msg_type,
             metadata=content['metadata'],
             mime_bundle=content['data'],
-            prompt_number=content['execution_count'],
+            execution_count=content['execution_count'],
         )
 
     elif msg_type == 'stream':
@@ -103,7 +103,7 b" def new_code_cell(source='', **kwargs):"
     cell.update(from_dict(kwargs))
     cell.setdefault('metadata', NotebookNode())
     cell.setdefault('source', '')
-    cell.setdefault('prompt_number', None)
+    cell.setdefault('execution_count', None)
     cell.setdefault('outputs', [])
 
     validate(cell, 'code_cell')

IPython/nbformat/v4/nbformat.v4.schema.json

@@ -150,7 +150,7 b''
             "description": "Notebook code cell.",
             "type": "object",
             "additionalProperties": false,
-            "required": ["cell_type", "metadata", "source", "outputs", "prompt_number"],
+            "required": ["cell_type", "metadata", "source", "outputs", "execution_count"],
             "properties": {
                 "cell_type": {
                     "description": "String identifying the type of cell.",
@@ -179,7 +179,7 b''
                     "type": "array",
                     "items": {"$ref": "#/definitions/output"}
                 },
-                "prompt_number": {
+                "execution_count": {
                     "description": "The code cell's prompt number. Will be null if the cell has not been run.",
                     "type": ["integer", "null"],
                     "minimum": 0
@@ -199,15 +199,15 b''
             "description": "Result of executing a code cell.",
             "type": "object",
             "additionalProperties": false,
-            "required": ["output_type", "metadata", "prompt_number"],
+            "required": ["output_type", "metadata", "execution_count"],
             "properties": {
                 "output_type": {
                     "description": "Type of cell output.",
                     "enum": ["execute_result"]
                 },
-                "prompt_number": {
+                "execution_count": {
                     "description": "A result's prompt number.",
-                    "type": ["integer"],
+                    "type": ["integer", "null"],
                     "minimum": 0
                 },
                 "application/json": {
@@ -314,7 +314,7 b''
                 "description": "Contents of the cell, represented as an array of lines.",
                 "$ref": "#/definitions/misc/multiline_string"
             },
-            "prompt_number": {
+            "execution_count": {
                 "description": "The code cell's prompt number. Will be null if the cell has not been run.",
                 "type": ["integer", "null"],
                 "minimum": 0

IPython/nbformat/v4/tests/nbexamples.py

@@ -20,7 +20,7 b' cells.append(new_markdown_cell('
 
 cells.append(new_code_cell(
     source='import numpy',
-    prompt_number=1,
+    execution_count=1,
 ))
 
 cells.append(new_markdown_cell(
@@ -38,20 +38,20 b' cells.append(new_heading_cell('
 
 cells.append(new_code_cell(
     source='a = numpy.random.rand(100)',
-    prompt_number=2,
+    execution_count=2,
 ))
 cells.append(new_code_cell(
     source='a = 10\nb = 5\n',
-    prompt_number=3,
+    execution_count=3,
 ))
 cells.append(new_code_cell(
     source='a = 10\nb = 5',
-    prompt_number=4,
+    execution_count=4,
 ))
 
 cells.append(new_code_cell(
     source=u'print "ünîcødé"',
-    prompt_number=3,
+    execution_count=3,
     outputs=[new_output(
         output_type=u'execute_result',
         mime_bundle={
@@ -66,7 +66,7 b' cells.append(new_code_cell('
             },
             'application/javascript': u'var i=0;'
         },
-        prompt_number=3
+        execution_count=3
     ),new_output(
         output_type=u'display_data',
         mime_bundle={

IPython/nbformat/v4/tests/test_nbbase.py

@@ -61,7 +61,7 b' def test_empty_stream():'
     nt.assert_equal(output.text, '')
 
 def test_empty_execute_result():
-    output = new_output('execute_result', prompt_number=1)
+    output = new_output('execute_result', execution_count=1)
     nt.assert_equal(output.output_type, 'execute_result')
 
 mimebundle = {
@@ -80,8 +80,8 b' def test_display_data():'
         nt.assert_equal(output[key], expected)
 
 def test_execute_result():
-    output = new_output('execute_result', mimebundle, prompt_number=10)
-    nt.assert_equal(output.prompt_number, 10)
+    output = new_output('execute_result', mimebundle, execution_count=10)
+    nt.assert_equal(output.execution_count, 10)
     for key, expected in mimebundle.items():
         nt.assert_equal(output[key], expected)
 
@@ -95,15 +95,15 b' def test_error():'
     nt.assert_equal(o.traceback, [u'frame 0', u'frame 1', u'frame 2'])
 
 def test_code_cell_with_outputs():
-    cell = new_code_cell(prompt_number=10, outputs=[
+    cell = new_code_cell(execution_count=10, outputs=[
         new_output('display_data', mimebundle),
         new_output('stream', text='hello'),
-        new_output('execute_result', mimebundle, prompt_number=10),
+        new_output('execute_result', mimebundle, execution_count=10),
     ])
-    nt.assert_equal(cell.prompt_number, 10)
+    nt.assert_equal(cell.execution_count, 10)
     nt.assert_equal(len(cell.outputs), 3)
     er = cell.outputs[-1]
-    nt.assert_equal(er.prompt_number, 10)
+    nt.assert_equal(er.execution_count, 10)
     nt.assert_equal(er['output_type'], 'execute_result')
 
 def test_stream():