Merge branch 'master' into auto-gen-wrappers

Author: vidartf

.gitignore

@@ -9,7 +9,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",
@@ -27,7 +27,7 @@
     "webpack": "^1.12.14"
   },
   "dependencies": {
-    "@jupyter-widgets/base": "^0.2.0",
+    "@jupyter-widgets/base": "0.5.1",
     "ndarray": "^1.0.18",
     "three": "^0.85.2",
     "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-widgets/base": "nbextensions/jupyter-widgets/extension"
+                "jupyter-threejs": "nbextensions/jupyter-threejs/index"
             }
         }
     });

jslab/lib/index.js

@@ -0,0 +1,16 @@
+var jupyter_threejs = require('jupyter-threejs');
+
+var jupyterlab_widgets = require('@jupyter-widgets/jupyterlab-manager');
+
+module.exports = {
+  id: 'jupyter.extensions.jupyter-threejs',
+  requires: [jupyterlab_widgets.INBWidgetExtension],
+  activate: function(app, widgets) {
+      widgets.registerWidget({
+          name: 'jupyter-threejs',
+          version: jupyter_threejs.version,
+          exports: jupyter_threejs
+      });
+  },
+  autoStart: true
+};

jslab/package.json

@@ -0,0 +1,18 @@
+{
+  "name": "jupyterlab-threejs",
+  "version": "0.1.0",
+  "description": "",
+  "main": "lib/index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "jupyterlab-threejs developers",
+  "license": "BSD-3-Clause",
+  "dependencies": {
+    "@jupyter-widgets/jupyterlab-manager": "^0.23.2",
+    "jupyter-threejs": "^0.3.0-alpha.0"
+  },
+  "jupyterlab": {
+    "extension": true
+  }
+}

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'

pythreejs/pythreejs.py

@@ -48,6 +48,7 @@ def vector2(trait_type=CFloat, default=None, **kwargs):
         default = [0, 0]
     return List(trait_type, default_value=default, minlen=2, maxlen=2, **kwargs)
 
+PYTHREEJS_VERSION='0.4.0-alpha.0'
 
 class ScaledObject(Object3D):
     """
@@ -211,6 +212,8 @@ def flatten(ll):
 class Effect(Widget):
     _view_module = Unicode(npm_pkg_name).tag(sync=True)
     _model_module = Unicode(npm_pkg_name).tag(sync=True)
+    _model_module_version = Unicode(PYTHREEJS_VERSION).tag(sync=True)
+    _view_module_version = Unicode(PYTHREEJS_VERSION).tag(sync=True)
 
 
 class AnaglyphEffect(Effect):

setup.py

@@ -47,12 +47,8 @@
             '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.0', 'traittypes'],
+    'install_requires': ['ipywidgets>=7.0.0a9', 'traittypes'],
     'packages': find_packages(),
     'zip_safe': False,
     'cmdclass': cmdclass,