From 9a1c137c462e6a5940bb7e14ffd85f51554e83f3 Mon Sep 17 00:00:00 2001
From: Sylvain Corlay <sylvain.corlay@gmail.com>
Date: Mon, 31 Oct 2016 20:10:58 +0100
Subject: [PATCH] Update for ipywidgets 6.0 beta

---
 .travis.yml          | 1 +
 js/package.json      | 9 ++++-----
 js/src/Toolbar.js    | 9 +++------
 js/src/labplugin.js  | 4 ++--
 js/webpack.config.js | 1 -
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 83066289a..bf2f0b8ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,7 @@ install:
   - conda update -q conda
   # Useful for debugging any issues with conda
   - conda info -a
+  - conda install pyyaml
   - conda env create -f test-environment.yml
   - source activate bqplot-test
   - pip install . coveralls
diff --git a/js/package.json b/js/package.json
index 23f4e5944..306a797ba 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bqplot",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "bqplot",
   "author": "BQPlot Development team",
   "license": "Apache-2.0",
@@ -27,10 +27,9 @@
   },
   "dependencies": {
     "d3": "^3.5.16",
-    "jquery": "^2.1.4",
-    "jupyter-js-widgets": "^2.0.2",
-    "jupyterlab": "^0.5.1",
-    "@jupyterlab/nbwidgets": "^0.3.4",
+    "jupyter-js-widgets": "^2.0.4",
+    "jupyterlab": "^0.7.0",
+    "@jupyterlab/nbwidgets": "^0.4.0",
     "topojson": "^1.6.24",
     "underscore": "^1.8.3"
   }
diff --git a/js/src/Toolbar.js b/js/src/Toolbar.js
index cd9600c20..911a24d32 100644
--- a/js/src/Toolbar.js
+++ b/js/src/Toolbar.js
@@ -158,9 +158,8 @@ var Toolbar = widgets.DOMWidgetView.extend({
 
         // Create the buttons
         var _panzoom = document.createElement("button");
-        _panzoom.classList.add("btn"); // bootstrap css
-        _panzoom.classList.add("btn-default"); // bootstrap css
         _panzoom.classList.add("jupyter-widgets"); // jupyter-js-widgets css
+        _panzoom.classList.add("jupyter-button"); // jupyter-js-widgets css
         _panzoom.classList.add("widget-toggle-button") // jupyter-js-widgets css
         _panzoom.setAttribute("data-toggle", "tooltip");
         _panzoom.setAttribute("title", "PanZoom");
@@ -173,9 +172,8 @@ var Toolbar = widgets.DOMWidgetView.extend({
         _panzoom.appendChild(panzoomicon);
 
         var _reset = document.createElement("button");
-        _reset.classList.add("btn"); // bootstrap css
-        _reset.classList.add("btn-default"); // bootstrap css
         _reset.classList.add("jupyter-widgets"); // jupyter-js-widgets css
+        _reset.classList.add("jupyter-button"); // jupyter-js-widgets css
         _reset.classList.add("widget-button") // jupyter-js-widgets css
         _reset.setAttribute("data-toggle", "tooltip");
         _reset.setAttribute("title", "Reset");
@@ -188,9 +186,8 @@ var Toolbar = widgets.DOMWidgetView.extend({
         _reset.appendChild(refreshicon);
 
         var _save = document.createElement("button");
-        _save.classList.add("btn"); // bootstrap css
-        _save.classList.add("btn-default"); // bootstrap css
         _save.classList.add("jupyter-widgets"); // jupyter-js-widgets css
+        _save.classList.add("jupyter-button"); // jupyter-js-widgets css
         _save.classList.add("widget-button") // jupyter-js-widgets css
         _save.setAttribute("data-toggle", "tooltip");
         _save.setAttribute("title", "Save");
diff --git a/js/src/labplugin.js b/js/src/labplugin.js
index 2cfc2d0ec..608a52d9c 100644
--- a/js/src/labplugin.js
+++ b/js/src/labplugin.js
@@ -15,14 +15,14 @@
 
 var bqplot = require('./index');
 
-var jupyterlab_widgets = require('@jupyterlab/nbwidgets/lib/plugin');
+var jupyterlab_widgets = require('@jupyterlab/nbwidgets');
 
 /**
  * The widget manager provider.
  */
 module.exports = {
   id: 'jupyter.extensions.bqplot',
-  requires: [jupyterlab_widgets.IIPyWidgetExtension],
+  requires: [jupyterlab_widgets.INBWidgetExtension],
   activate: function(app, widgets) {
       widgets.registerWidget({
           name: 'bqplot',
diff --git a/js/webpack.config.js b/js/webpack.config.js
index 66d946d2c..5afdcf70a 100644
--- a/js/webpack.config.js
+++ b/js/webpack.config.js
@@ -2,7 +2,6 @@ var loaders = [
     { test: /\.css$/, loader: "style-loader!css-loader" },
     { test: /\.less$/, loader: "style-loader!css-loader!less-loader" },
     { test: /\.json$/, loader: "json-loader" },
-    // jquery-ui loads some images
     { test: /\.(jpg|png|gif)$/, loader: "file" },
     // required to load font-awesome
     { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&mimetype=application/font-woff" },