Merge pull request #118 from jasongrout/w7

WIP upgrade to ipywidgets 7

Author: jasongrout

MANIFEST.in

@@ -1 +1,3 @@
 recursive-include pythreejs/static *.*
+
+include setupbase.py

js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jupyter-threejs",
-  "version": "0.4.0-alpha.0",
+  "version": "0.4.0-rc.0",
   "description": "jupyter - threejs bridge",
   "author": "Jupyter-Threejs development team",
   "license": "BSD-3-Clause",
@@ -10,16 +10,16 @@
     "url": "https://github.com/jovyan/pythreejs.git"
   },
   "scripts": {
+    "clean": "rimraf dist && rimraf ../pythreejs/static",
     "build": "webpack",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "prepublish": "npm run build"
   },
   "devDependencies": {
-    "json-loader": "^0.5.4",
     "rimraf": "^2.4.1",
-    "webpack": "^1.12.14"
+    "webpack": "^3.6.0"
   },
   "dependencies": {
-    "@jupyter-widgets/base": "0.5.1",
+    "@jupyter-widgets/base": "^1.0.0",
     "ndarray": "^1.0.18",
     "three": "^0.75.0",
     "underscore": "^1.8.3"

js/src/jupyter-threejs.js

@@ -1,6 +1,9 @@
 define(["@jupyter-widgets/base", "underscore", "three", "ndarray"],
        function(widgets, _, THREE, ndarray) {
 
+    var VIEW_MODULE_VERSION = '0.4.0';
+    var MODEL_MODULE_VERSION = VIEW_MODULE_VERSION;
+
     window.THREE = THREE;
     require("./examples/js/renderers/Projector.js");
     require("./examples/js/renderers/CanvasRenderer.js");
@@ -1268,7 +1271,9 @@ define(["@jupyter-widgets/base", "underscore", "three", "ndarray"],
             _view_module: 'jupyter-threejs',
             _model_module: 'jupyter-threejs',
             _view_name: 'Object3dView',
-            _model_name: 'Object3dModel'
+            _model_name: 'Object3dModel',
+            _view_module_version: VIEW_MODULE_VERSION,
+            _model_module_version: MODEL_MODULE_VERSION
         })
     }, {
         serializers: _.extend({
@@ -1349,9 +1354,10 @@ define(["@jupyter-widgets/base", "underscore", "three", "ndarray"],
         defaults: _.extend({}, widgets.WidgetModel.prototype.defaults, {
             _view_module: 'jupyter-threejs',
             _model_module: 'jupyter-threejs',
-
             _view_name: 'ControlsView',
             _model_name: 'ControlsModel',
+            _view_module_version: VIEW_MODULE_VERSION,
+            _model_module_version: MODEL_MODULE_VERSION,
             controling: null
         })
     }, {
@@ -1419,7 +1425,10 @@ define(["@jupyter-widgets/base", "underscore", "three", "ndarray"],
     var EffectModel = widgets.WidgetModel.extend({
         defaults: _.extend({}, widgets.WidgetModel.prototype.defaults, {
             _model_module: 'jupyter-threejs',
-            _view_module: 'jupyter-threejs'
+            _view_module: 'jupyter-threejs',
+            _view_module_version: VIEW_MODULE_VERSION,
+            _model_module_version: MODEL_MODULE_VERSION
+
         })
     });
 
@@ -1436,6 +1445,8 @@ define(["@jupyter-widgets/base", "underscore", "three", "ndarray"],
             _view_module: 'jupyter-threejs',
             _model_name: 'MaterialModel',
             _view_name: 'MaterialView',
+            _view_module_version: VIEW_MODULE_VERSION,
+            _model_module_version: MODEL_MODULE_VERSION,
 
             name: '',
             side: 'DoubleSide',
@@ -1600,7 +1611,9 @@ define(["@jupyter-widgets/base", "underscore", "three", "ndarray"],
         defaults: _.extend({}, widgets.WidgetModel.prototype.defaults, {
             _view_module: 'jupyter-threejs',
             _model_module: 'jupyter-threejs',
-            _model_name: 'TextureModel'
+            _model_name: 'TextureModel',
+            _view_module_version: VIEW_MODULE_VERSION,
+            _model_module_version: MODEL_MODULE_VERSION
         })
     });
 
@@ -1649,7 +1662,9 @@ define(["@jupyter-widgets/base", "underscore", "three", "ndarray"],
             _model_module: 'jupyter-threejs',
             _view_module: 'jupyter-threejs',
             _model_name: 'GeometryModel',
-            _view_name: 'GeometryView'
+            _view_name: 'GeometryView',
+            _view_module_version: VIEW_MODULE_VERSION,
+            _model_module_version: MODEL_MODULE_VERSION
         })
     });
 
@@ -2017,6 +2032,8 @@ define(["@jupyter-widgets/base", "underscore", "three", "ndarray"],
             _model_module: 'jupyter-threejs',
             _view_name: 'RendererView',
             _model_name: 'RendererModel',
+            _view_module_version: VIEW_MODULE_VERSION,
+            _model_module_version: MODEL_MODULE_VERSION,
 
             width: 600,
             height: 100,

js/webpack.config.js

@@ -1,40 +1,32 @@
-var loaders = [
-    { test: /\.json$/, loader: "json-loader" },
-];
+var path = require('path');
 
 module.exports = [
     {// Notebook extension
         entry: './src/extension.js',
         output: {
             filename: 'extension.js',
-            path: '../pythreejs/static',
+            path: path.resolve(__dirname, '..', 'pythreejs', 'static'),
             libraryTarget: 'amd'
         }
     },
     {// jupyter-threejs bundle for the notebook
         entry: './src/index.js',
         output: {
             filename: 'index.js',
-            path: '../pythreejs/static',
+            path: path.resolve(__dirname, '..', 'pythreejs', 'static'),
             libraryTarget: 'amd'
         },
         devtool: 'source-map',
-        module: {
-            loaders: loaders
-        },
         externals: ['@jupyter-widgets/base']
     },
     {// embeddable jupyter-threejs bundle
         entry: './src/index.js',
         output: {
             filename: 'index.js',
-            path: './dist/',
+            path: path.resolve(__dirname, 'dist'),
             libraryTarget: 'amd'
         },
         devtool: 'source-map',
-        module: {
-            loaders: loaders
-        },
         externals: ['@jupyter-widgets/base']
     }
 ];

jslab/package.json

@@ -9,8 +9,8 @@
   "author": "jupyterlab-threejs developers",
   "license": "BSD-3-Clause",
   "dependencies": {
-    "@jupyter-widgets/jupyterlab-manager": "^0.23.2",
-    "jupyter-threejs": "^0.3.0-alpha.0"
+    "@jupyter-widgets/jupyterlab-manager": "^0.27.0",
+    "jupyter-threejs": "^0.4.0"
   },
   "jupyterlab": {
     "extension": true

pythreejs/_version.py

@@ -1,8 +1,8 @@
-version_info = (0, 4, 0, 'alpha', 0)
+version_info = (0, 4, 0, 'candidate', 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'
+EXTENSION_VERSION = '0.4.0-rc.0'

setup.py

@@ -48,7 +48,7 @@
             'pythreejs/static/index.js.map',
         ]),
     ],
-    'install_requires': ['ipywidgets>=7.0.0a9', 'traittypes'],
+    'install_requires': ['ipywidgets>=7,<8', 'traittypes'],
     'packages': find_packages(),
     'zip_safe': False,
     'cmdclass': cmdclass,

setupbase.py

@@ -348,11 +348,12 @@ def run(self):
                         pass
 
             result = cls.run(self)
-            data_files = []
-            for dname in data_dirs:
-                data_files.extend(get_data_files(dname))
-            # update data-files in case this created new files
-            self.distribution.data_files = data_files
+            if data_dirs:
+                data_files = self.distribution.data_files if self.distribution.data_files else []
+                for dname in data_dirs:
+                    data_files.extend(get_data_files(dname))
+                # update data-files in case this created new files
+                self.distribution.data_files = data_files
             # also update package data
             update_package_data(self.distribution)
             return result