Merge pull request #107 from SylvainCorlay/ipywidgets-alpha-update

Update to ipywidgets 7.0.0a9

Author: SylvainCorlay

.gitignore

@@ -7,7 +7,6 @@ node_modules/
 
 # Compiled javascript
 pythreejs/static/
-pythreejs/staticlab/
 
 # OS X
 .DS_Store

MANIFEST.in

@@ -1,2 +1 @@
 recursive-include pythreejs/static *.*
-recursive-include pythreejs/staticlab *.*

js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jupyter-threejs",
-  "version": "0.3.0-alpha.0",
+  "version": "0.4.0-alpha.0",
   "description": "jupyter - threejs bridge",
   "author": "Jupyter-Threejs development team",
   "license": "BSD-3-Clause",
@@ -19,7 +19,7 @@
     "webpack": "^1.12.14"
   },
   "dependencies": {
-    "jupyter-js-widgets": "^3.0.0-alpha.2",
+    "@jupyter-widgets/base": "0.5.1",
     "ndarray": "^1.0.18",
     "three": "^0.75.0",
     "underscore": "^1.8.3"

js/src/extension.js

@@ -3,8 +3,7 @@ if (window.require) {
     window.require.config({
         map: {
             "*" : {
-                "jupyter-threejs": "nbextensions/jupyter-threejs/index",
-                "jupyter-js-widgets": "nbextensions/jupyter-js-widgets/extension"
+                "jupyter-threejs": "nbextensions/jupyter-threejs/index"
             }
         }
     });

js/src/jupyter-threejs.js

@@ -1,4 +1,4 @@
-define(["jupyter-js-widgets", "underscore", "three", "ndarray"],
+define(["@jupyter-widgets/base", "underscore", "three", "ndarray"],
        function(widgets, _, THREE, ndarray) {
 
     window.THREE = THREE;

js/webpack.config.js

@@ -22,7 +22,7 @@ module.exports = [
         module: {
             loaders: loaders
         },
-        externals: ['jupyter-js-widgets']
+        externals: ['@jupyter-widgets/base']
     },
     {// embeddable jupyter-threejs bundle
         entry: './src/index.js',
@@ -35,6 +35,6 @@ module.exports = [
         module: {
             loaders: loaders
         },
-        externals: ['jupyter-js-widgets']
+        externals: ['@jupyter-widgets/base']
     }
 ];

jslab/lib/index.js

@@ -1,8 +1,8 @@
 var jupyter_threejs = require('jupyter-threejs');
 
-var jupyterlab_widgets = require('@jupyterlab/nbwidgets');
+var jupyterlab_widgets = require('@jupyter-widgets/jupyterlab-manager');
 
-module.exports.default = {
+module.exports = {
   id: 'jupyter.extensions.jupyter-threejs',
   requires: [jupyterlab_widgets.INBWidgetExtension],
   activate: function(app, widgets) {

jslab/package.json

@@ -9,7 +9,7 @@
   "author": "jupyterlab-threejs developers",
   "license": "BSD-3-Clause",
   "dependencies": {
-    "@jupyterlab/nbwidgets": "^0.18.0",
+    "@jupyter-widgets/jupyterlab-manager": "^0.23.2",
     "jupyter-threejs": "^0.3.0-alpha.0"
   },
   "jupyterlab": {

pythreejs/__init__.py

@@ -145,9 +145,3 @@ def _jupyter_nbextension_paths():
         'dest': npm_pkg_name,
         'require': npm_pkg_name + '/extension'
     }]
-
-def _jupyter_labextension_paths():
-    return [{
-        'name': npm_pkg_name,
-        'src': 'staticlab'
-    }]

pythreejs/_version.py

@@ -1,2 +1,8 @@
-version_info = (0, 3, 0)
-__version__ = '.'.join(map(str, version_info))
+version_info = (0, 4, 0, 'alpha', 0)
+
+_specifier_ = {'alpha': 'a', 'beta': 'b', 'candidate': 'rc', 'final': ''}
+
+__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-alpha.0'

setup.py

@@ -130,12 +130,8 @@ def run(self):
             'pythreejs/static/index.js',
             'pythreejs/static/index.js.map',
         ]),
-        ('share/jupyter/labextensions/jupyter-threejs', [
-            'pythreejs/staticlab/jupyter-threejs.bundle.js',
-            'pythreejs/staticlab/jupyter-threejs.bundle.js.manifest',
-        ]),
     ],
-    'install_requires': ['ipywidgets>=7.0.0a1', 'traittypes'],
+    'install_requires': ['ipywidgets>=7.0.0a9', 'traittypes'],
     'packages': find_packages(),
     'zip_safe': False,
     'cmdclass': {