New bugfix release.

Laeeth · Jul 2, 2017 · 1f34f27 · 1f34f27
1 parent 04f8e4b
commit 1f34f27
Show file tree

Hide file tree

Showing 7 changed files with 182 additions and 52 deletions.
diff --git a/notebooks/%%block-demo.ipynb b/notebooks/%%block-demo.ipynb
@@ -4,18 +4,22 @@
  "cell_type": "code",
  "execution_count": 1,
  "metadata": {
- "collapsed": true
+ "collapsed": true,
+ "deletable": true,
+ "editable": true
  },
  "outputs": [],
  "source": [
- "%run ../py-d3.py"
+ "%run ../py_d3/py_d3.py"
  ]
  },
  {
  "cell_type": "code",
  "execution_count": 2,
  "metadata": {
- "collapsed": false
+ "collapsed": false,
+ "deletable": true,
+ "editable": true
  },
  "outputs": [
  {
@@ -233,7 +237,9 @@
  "cell_type": "code",
  "execution_count": null,
  "metadata": {
- "collapsed": true
+ "collapsed": true,
+ "deletable": true,
+ "editable": true
  },
  "outputs": [],
  "source": []
@@ -255,7 +261,7 @@
  "name": "python",
  "nbconvert_exporter": "python",
  "pygments_lexer": "ipython3",
- "version": "3.5.2"
+ "version": "3.6.0"
  }
  },
  "nbformat": 4,

diff --git a/notebooks/%%d3-4.0-example.ipynb b/notebooks/%%d3-4.0-example.ipynb
@@ -4,18 +4,22 @@
  "cell_type": "code",
  "execution_count": 1,
  "metadata": {
- "collapsed": true
+ "collapsed": true,
+ "deletable": true,
+ "editable": true
  },
  "outputs": [],
  "source": [
- "%run ../py-d3.py"
+ "%run ../py_d3/py_d3.py"
  ]
  },
  {
  "cell_type": "code",
  "execution_count": 2,
  "metadata": {
- "collapsed": false
+ "collapsed": false,
+ "deletable": true,
+ "editable": true
  },
  "outputs": [
  {
@@ -49,6 +53,8 @@
  "execution_count": 3,
  "metadata": {
  "collapsed": false,
+ "deletable": true,
+ "editable": true,
  "scrolled": false
  },
  "outputs": [
@@ -239,7 +245,7 @@
  "name": "python",
  "nbconvert_exporter": "python",
  "pygments_lexer": "ipython3",
- "version": "3.5.2"
+ "version": "3.6.0"
  }
  },
  "nbformat": 4,

diff --git a/notebooks/%%d3-demo-continued.ipynb b/notebooks/%%d3-demo-continued.ipynb
@@ -2,7 +2,10 @@
  "cells": [
  {
  "cell_type": "markdown",
- "metadata": {},
+ "metadata": {
+ "deletable": true,
+ "editable": true
+ },
  "source": [
  "This notebook demonstrates a few more D3 charts plotted inline using the `%%d3` line magic."
  ]
@@ -11,16 +14,21 @@
  "cell_type": "code",
  "execution_count": 1,
  "metadata": {
- "collapsed": true
+ "collapsed": true,
+ "deletable": true,
+ "editable": true
  },
  "outputs": [],
  "source": [
- "%run ../py_d3.py"
+ "%run ../py_d3/py_d3.py"
  ]
  },
  {
  "cell_type": "markdown",
- "metadata": {},
+ "metadata": {
+ "deletable": true,
+ "editable": true
+ },
  "source": [
  "**Circular Layout (Raindrops)**\n",
  "\n",
@@ -31,7 +39,9 @@
  "cell_type": "code",
  "execution_count": 2,
  "metadata": {
- "collapsed": false
+ "collapsed": false,
+ "deletable": true,
+ "editable": true
  },
  "outputs": [
  {
@@ -214,7 +224,10 @@
  },
  {
  "cell_type": "markdown",
- "metadata": {},
+ "metadata": {
+ "deletable": true,
+ "editable": true
+ },
  "source": [
  "**Transform Transitions**\n",
  "\n",
@@ -226,6 +239,8 @@
  "execution_count": null,
  "metadata": {
  "collapsed": false,
+ "deletable": true,
+ "editable": true,
  "scrolled": false
  },
  "outputs": [],
@@ -291,7 +306,10 @@
  },
  {
  "cell_type": "markdown",
- "metadata": {},
+ "metadata": {
+ "deletable": true,
+ "editable": true
+ },
  "source": [
  "**Streamgraph**\n",
  "\n",
@@ -304,7 +322,9 @@
  "cell_type": "code",
  "execution_count": null,
  "metadata": {
- "collapsed": false
+ "collapsed": false,
+ "deletable": true,
+ "editable": true
  },
  "outputs": [],
  "source": [
@@ -402,7 +422,10 @@
  },
  {
  "cell_type": "markdown",
- "metadata": {},
+ "metadata": {
+ "deletable": true,
+ "editable": true
+ },
  "source": [
  "**Treemap**\n",
  "\n",
@@ -413,7 +436,9 @@
  "cell_type": "code",
  "execution_count": null,
  "metadata": {
- "collapsed": false
+ "collapsed": false,
+ "deletable": true,
+ "editable": true
  },
  "outputs": [],
  "source": [
@@ -507,7 +532,10 @@
  },
  {
  "cell_type": "markdown",
- "metadata": {},
+ "metadata": {
+ "deletable": true,
+ "editable": true
+ },
  "source": [
  "**Radial Reingold–Tilford Tree**\n",
  "\n",
@@ -518,7 +546,9 @@
  "cell_type": "code",
  "execution_count": null,
  "metadata": {
- "collapsed": false
+ "collapsed": false,
+ "deletable": true,
+ "editable": true
  },
  "outputs": [],
  "source": [
@@ -614,7 +644,7 @@
  "name": "python",
  "nbconvert_exporter": "python",
  "pygments_lexer": "ipython3",
- "version": "3.5.2"
+ "version": "3.6.0"
  }
  },
  "nbformat": 4,

diff --git a/notebooks/%%d3-demo.ipynb b/notebooks/%%d3-demo.ipynb
@@ -2,36 +2,88 @@
  "cells": [
  {
  "cell_type": "markdown",
- "metadata": {},
+ "metadata": {
+ "deletable": true,
+ "editable": true
+ },
  "source": [
  "This notebook demonstrates a few D3 charts plotted inline using the `%%d3` line magic."
  ]
  },
  {
  "cell_type": "code",
- "execution_count": null,
+ "execution_count": 8,
  "metadata": {
- "collapsed": false
+ "collapsed": false,
+ "deletable": true,
+ "editable": true
  },
  "outputs": [],
  "source": [
- "%run ../py-d3.py"
+ "%run ../py_d3/py_d3.py"
  ]
  },
  {
  "cell_type": "markdown",
- "metadata": {},
+ "metadata": {
+ "deletable": true,
+ "editable": true
+ },
  "source": [
  "**Obligatory Hello World**"
  ]
  },
  {
  "cell_type": "code",
- "execution_count": null,
+ "execution_count": 10,
  "metadata": {
- "collapsed": false
+ "collapsed": false,
+ "deletable": true,
+ "editable": true
  },
- "outputs": [],
+ "outputs": [
+ {
+ "data": {
+ "text/html": [
+ "\n",
+ "<script>\n",
+ "requirejs.config({\n",
+ " paths: {\n",
+ " d3: \"//cdnjs.cloudflare.com/ajax/libs/d3/3.5.17/d3\"\n",
+ " }\n",
+ "});\n",
+ "\n",
+ "require(['d3'], function(d3) {\n",
+ " window.d3 = d3;\n",
+ "});\n",
+ "</script>\n",
+ "<script>\n",
+ "_select = d3.select;\n",
+ "\n",
+ "d3.select1 = function(selection) {\n",
+ " return _select(\"#d3-cell-1\").select(selection);\n",
+ "}\n",
+ "d3.selectAll1 = function(selection) {\n",
+ " return _select(\"#d3-cell-1\").selectAll(selection);\n",
+ "}\n",
+ "</script>\n",
+ "<g id=\"d3-cell-1\">\n",
+ "\n",
+ "<g></g>\n",
+ "\n",
+ "<script>\n",
+ "d3.select1(\"g\").text(\"Hello World\");\n",
+ "</script>\n",
+ "</g>"
+ ],
+ "text/plain": [
+ "<IPython.core.display.HTML object>"
+ ]
+ },
+ "metadata": {},
+ "output_type": "display_data"
+ }
+ ],
  "source": [
  "%%d3\n",
  "\n",
@@ -44,7 +96,10 @@
  },
  {
  "cell_type": "markdown",
- "metadata": {},
+ "metadata": {
+ "deletable": true,
+ "editable": true
+ },
  "source": [
  "**Let's Make a Bar Chart Example**\n",
  "\n",
@@ -55,7 +110,9 @@
  "cell_type": "code",
  "execution_count": null,
  "metadata": {
- "collapsed": false
+ "collapsed": false,
+ "deletable": true,
+ "editable": true
  },
  "outputs": [],
  "source": [
@@ -94,7 +151,10 @@
  },
  {
  "cell_type": "markdown",
- "metadata": {},
+ "metadata": {
+ "deletable": true,
+ "editable": true
+ },
  "source": [
  "**D3 Show Reel**\n",
  "\n",
@@ -105,7 +165,9 @@
  "cell_type": "code",
  "execution_count": null,
  "metadata": {
- "collapsed": false
+ "collapsed": false,
+ "deletable": true,
+ "editable": true
  },
  "outputs": [],
  "source": [
@@ -695,7 +757,9 @@
  "cell_type": "code",
  "execution_count": null,
  "metadata": {
- "collapsed": true
+ "collapsed": true,
+ "deletable": true,
+ "editable": true
  },
  "outputs": [],
  "source": []
@@ -718,7 +782,7 @@
  "name": "python",
  "nbconvert_exporter": "python",
  "pygments_lexer": "ipython3",
- "version": "3.5.2"
+ "version": "3.6.0"
  }
  },
  "nbformat": 4,