Merge pull request #130 from SylvainCorlay/move-jupyterlab-plugin

SylvainCorlay · web-flow · commit 1460d5de0674 · 2017-11-06T01:03:35.000+01:00
Move JupyterLab plugin to main npm package
diff --git a/js/package.json b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jupyter-threejs",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "jupyter - threejs bridge",
   "author": "Jupyter-Threejs development team",
   "license": "BSD-3-Clause",
@@ -23,5 +23,8 @@
     "ndarray": "^1.0.18",
     "three": "^0.75.0",
     "underscore": "^1.8.3"
+  },
+  "jupyterlab": {
+    "extension": "src/jupyterlab-plugin"
   }
 }
diff --git a/js/src/jupyterlab-plugin.js b/js/src/jupyterlab-plugin.js
@@ -1,10 +1,10 @@
-var jupyter_threejs = require('jupyter-threejs');
+var jupyter_threejs = require('./index');
 
-var jupyterlab_widgets = require('@jupyter-widgets/jupyterlab-manager');
+var base = require('@jupyter-widgets/base');
 
 module.exports = {
   id: 'jupyter.extensions.jupyter-threejs',
-  requires: [jupyterlab_widgets.INBWidgetExtension],
+  requires: [base.IJupyterWidgetRegistry],
   activate: function(app, widgets) {
       widgets.registerWidget({
           name: 'jupyter-threejs',
diff --git a/jslab/package.json b/jslab/package.json
diff --git a/pythreejs/_version.py b/pythreejs/_version.py
@@ -5,4 +5,4 @@
 __version__ = '%s.%s.%s%s'%(version_info[0], version_info[1], version_info[2],
           '' if version_info[3]=='final' else _specifier_[version_info[3]]+str(version_info[4]))
 
-EXTENSION_VERSION = '0.4.0'
+EXTENSION_VERSION = '0.4.1'

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "jupyter-threejs",`
`3`		`- "version": "0.4.0",`
	`3`	`+ "version": "0.4.1",`
`4`	`4`	`"description": "jupyter - threejs bridge",`
`5`	`5`	`"author": "Jupyter-Threejs development team",`
`6`	`6`	`"license": "BSD-3-Clause",`
`@@ -23,5 +23,8 @@`
`23`	`23`	`"ndarray": "^1.0.18",`
`24`	`24`	`"three": "^0.75.0",`
`25`	`25`	`"underscore": "^1.8.3"`
	`26`	`+ },`
	`27`	`+ "jupyterlab": {`
	`28`	`+ "extension": "src/jupyterlab-plugin"`
`26`	`29`	`}`
`27`	`30`	`}`