Updating example notebooks to v3 format.

docs/examples/notebooks/00_notebook_tour.ipynb

@@ -2,7 +2,7 b''
  "metadata": {
   "name": "00_notebook_tour"
  }, 
- "nbformat": 2, 
+ "nbformat": 3,
  "worksheets": [
   {
    "cells": [

docs/examples/notebooks/01_notebook_introduction.ipynb

@@ -2,7 +2,7 b''
  "metadata": {
   "name": "01_notebook_introduction"
  }, 
- "nbformat": 2, 
+ "nbformat": 3,
  "worksheets": [
   {
    "cells": [

docs/examples/notebooks/display_protocol.ipynb

@@ -2,7 +2,7 b''
  "metadata": {
   "name": "display_protocol"
  }, 
- "nbformat": 2, 
+ "nbformat": 3,
  "worksheets": [
   {
    "cells": [

docs/examples/notebooks/formatting.ipynb

@@ -2,7 +2,7 b''
  "metadata": {
   "name": "formatting"
  }, 
- "nbformat": 2, 
+ "nbformat": 3,
  "worksheets": [
   {
    "cells": [

docs/examples/notebooks/sympy.ipynb

@@ -2,7 +2,7 b''
  "metadata": {
   "name": "sympy"
  }, 
- "nbformat": 2, 
+ "nbformat": 3,
  "worksheets": [
   {
    "cells": [

docs/examples/notebooks/sympy_quantum_computing.ipynb

@@ -2,7 +2,7 b''
  "metadata": {
   "name": "sympy_quantum_computing"
  },
- "nbformat": 2,
+ "nbformat": 3,
  "worksheets": [
   {
    "cells": [

docs/examples/notebooks/trapezoid_rule.ipynb

@@ -2,7 +2,7 b''
  "metadata": {
   "name": "trapezoid_rule"
  }, 
- "nbformat": 2, 
+ "nbformat": 3,
  "worksheets": [
   {
    "cells": [

docs/examples/parallel/helloworld.ipynb

@@ -2,7 +2,7 b''
  "metadata": {
   "name": "helloworld"
  }, 
- "nbformat": 2, 
+ "nbformat": 3,
  "worksheets": [
   {
    "cells": [

docs/examples/parallel/parallel_mpi.ipynb

@@ -2,7 +2,7 b''
  "metadata": {
   "name": "parallel_mpi"
  }, 
- "nbformat": 2, 
+ "nbformat": 3,
  "worksheets": [
   {
    "cells": [

docs/examples/parallel/task1.ipynb

@@ -1,87 +1,116 b''
 {
-    "nbformat": 2, 
     "metadata": {
-        "name": "task_1"
+  "name": "task1"
     }, 
+ "nbformat": 3,
     "worksheets": [
         {
             "cells": [
                 {
-                    "source": "# Simple task farming example", 
-                    "cell_type": "markdown"
+     "cell_type": "markdown",
+     "source": [
+      "# Simple task farming example"
+     ]
                 }, 
                 {
                     "cell_type": "code", 
+     "collapsed": true,
+     "input": [
+      "from IPython.parallel import Client"
+     ],
                     "language": "python", 
                     "outputs": [], 
-                    "collapsed": true, 
-                    "prompt_number": 3, 
-                    "input": "from IPython.parallel import Client"
+     "prompt_number": 3
                 }, 
                 {
-                    "source": "A `Client.load_balanced_view` is used to get the object used for working with load balanced tasks.", 
-                    "cell_type": "markdown"
+     "cell_type": "markdown",
+     "source": [
+      "A `Client.load_balanced_view` is used to get the object used for working with load balanced tasks."
+     ]
                 }, 
                 {
                     "cell_type": "code", 
+     "collapsed": true,
+     "input": [
+      "rc = Client()",
+      "v = rc.load_balanced_view()"
+     ],
                     "language": "python", 
                     "outputs": [], 
-                    "collapsed": true, 
-                    "prompt_number": 4, 
-                    "input": "rc = Client()\nv = rc.load_balanced_view()"
+     "prompt_number": 4
                 }, 
                 {
-                    "source": "Set the variable `d` on all engines:", 
-                    "cell_type": "markdown"
+     "cell_type": "markdown",
+     "source": [
+      "Set the variable `d` on all engines:"
+     ]
                 }, 
                 {
                     "cell_type": "code", 
+     "collapsed": true,
+     "input": [
+      "rc[:]['d'] = 30"
+     ],
                     "language": "python", 
                     "outputs": [], 
-                    "collapsed": true, 
-                    "prompt_number": 5, 
-                    "input": "rc[:]['d'] = 30"
+     "prompt_number": 5
                 }, 
                 {
-                    "source": "Define a function that will be our task:", 
-                    "cell_type": "markdown"
+     "cell_type": "markdown",
+     "source": [
+      "Define a function that will be our task:"
+     ]
                 }, 
                 {
                     "cell_type": "code", 
+     "collapsed": true,
+     "input": [
+      "def task(a):",
+      "    return a, 10*d, a*10*d"
+     ],
                     "language": "python", 
                     "outputs": [], 
-                    "collapsed": true, 
-                    "prompt_number": 6, 
-                    "input": "def task(a):\n    return a, 10*d, a*10*d"
+     "prompt_number": 6
                 }, 
                 {
-                    "source": "Run the task once:", 
-                    "cell_type": "markdown"
+     "cell_type": "markdown",
+     "source": [
+      "Run the task once:"
+     ]
                 }, 
                 {
                     "cell_type": "code", 
+     "collapsed": true,
+     "input": [
+      "ar = v.apply(task, 5)"
+     ],
                     "language": "python", 
                     "outputs": [], 
-                    "collapsed": true, 
-                    "prompt_number": 7, 
-                    "input": "ar = v.apply(task, 5)"
+     "prompt_number": 7
                 }, 
                 {
-                    "source": "Print the results:", 
-                    "cell_type": "markdown"
+     "cell_type": "markdown",
+     "source": [
+      "Print the results:"
+     ]
                 }, 
                 {
                     "cell_type": "code", 
+     "collapsed": false,
+     "input": [
+      "print \"a, b, c: \", ar.get()"
+     ],
                     "language": "python", 
                     "outputs": [
                         {
                             "output_type": "stream", 
-                            "text": "a, b, c:  [5, 300, 1500]"
+       "stream": "stdout",
+       "text": [
+        "a, b, c:  [5, 300, 1500]"
+       ]
                         }
                     ], 
-                    "collapsed": false, 
-                    "prompt_number": 8, 
-                    "input": "print \"a, b, c: \", ar.get()"
+     "prompt_number": 8
                 }
             ]
         }

docs/examples/parallel/taskmap.ipynb

@@ -2,7 +2,7 b''
  "metadata": {
   "name": "taskmap"
  }, 
- "nbformat": 2, 
+ "nbformat": 3,
  "worksheets": [
   {
    "cells": [