Merge branch 'master' into auto-gen-wrappers

Author: vidartf

LICENSE

@@ -25,3 +25,41 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+-------------------------------------------------------------------------------
+
+The setupbase.py file is from the jupyter-packaging project:
+https://github.com/jupyter/jupyter-packaging/blob/0bb5d34eee0da3d2b53760ab1371dc0ee9af9b8d/jupyter_packaging/setupbase.py
+
+The license is (from https://github.com/jupyter/jupyter-packaging/blob/0bb5d34eee0da3d2b53760ab1371dc0ee9af9b8d/LICENSE):
+
+BSD 3-Clause License
+
+Copyright (c) 2017, Project Jupyter
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

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",
   "description": "jupyter - threejs bridge",
   "author": "Jupyter-Threejs development team",
   "license": "BSD-3-Clause",
@@ -10,20 +10,18 @@
     "url": "https://github.com/jovyan/pythreejs.git"
   },
   "scripts": {
-    "clean": "node ./scripts/clean-generated-files.js",
+    "clean": "rimraf dist && rimraf ../pythreejs/static && node ./scripts/clean-generated-files.js",
     "autogen-enums": "node ./scripts/generate-enums.js",
     "autogen": "node ./scripts/generate-wrappers.js",
-    "prepublish": "npm run autogen",
     "build": "webpack && node ./scripts/copy-three.js",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "prepublish": "npm run autogen && npm run build"
   },
   "devDependencies": {
     "fs-extra": "^4.0.1",
     "glob": "^7.0.6",
     "handlebars": "^4.0.5",
-    "json-loader": "^0.5.4",
     "rimraf": "^2.4.1",
-    "webpack": "^3.5.5"
+    "webpack": "^3.6.0"
   },
   "dependencies": {
     "@jupyter-widgets/base": "^1.0.0",

js/src/_base/Three.js

@@ -19,7 +19,8 @@ var ThreeModel = widgets.WidgetModel.extend({
     defaults: function() {
         return _.extend(widgets.WidgetModel.prototype.defaults.call(this), {
             _model_name: this.constructor.model_name,
-            _model_module: 'jupyter-threejs',
+            _model_module: this.constructor.model_module,
+            _model_version: this.constructor.model_module_version
         });
     },
 

js/webpack.config.js

@@ -1,9 +1,5 @@
 const path = require('path');
 
-var loaders = [
-    { test: /\.json$/, loader: "json-loader" }
-];
-
 var externals = ['@jupyter-widgets/base', 'jupyter-datawidgets', 'three'];
 
 module.exports = [
@@ -12,7 +8,7 @@ module.exports = [
         entry: './src/extension.js',
         output: {
             filename: 'extension.js',
-            path: path.resolve('../pythreejs/static'),
+            path: path.resolve(__dirname, '..', 'pythreejs', 'static'),
             libraryTarget: 'amd'
         },
         resolve: {
@@ -24,13 +20,10 @@ module.exports = [
         entry: './src/index.js',
         output: {
             filename: 'index.js',
-            path: path.resolve('../pythreejs/static'),
+            path: path.resolve(__dirname, '..', 'pythreejs', 'static'),
             libraryTarget: 'amd'
         },
         devtool: 'source-map',
-        module: {
-            rules: loaders
-        },
         externals: externals,
         resolve: {
             extensions: [ ".autogen.js", ".js" ]
@@ -42,13 +35,10 @@ module.exports = [
         entry: './src/embed.js',
         output: {
             filename: 'index.js',
-            path: path.resolve('./dist/'),
+            path: path.resolve(__dirname, 'dist'),
             libraryTarget: 'amd'
         },
         devtool: 'source-map',
-        module: {
-            rules: loaders
-        },
         externals: externals,
         resolve: {
             extensions: [ ".autogen.js", ".js" ]
@@ -60,12 +50,9 @@ module.exports = [
         entry: './src/index.js',
         output: {
             filename: 'index.standalone.js',
-            path: path.resolve('./dist/'),
+            path: path.resolve(__dirname, 'dist'),
         },
         devtool: 'source-map',
-        module: {
-            rules: loaders
-        },
         resolve: {
             extensions: [ ".autogen.js", ".js" ]
         },

jslab/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jupyterlab-threejs",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -11,7 +11,7 @@
   "dependencies": {
     "@jupyter-widgets/jupyterlab-manager": "^0.27.0",
     "jupyterlab-datawidgets": "^2.0.1",
-    "jupyter-threejs": "^0.4.0-alpha.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, 'final', 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'

setup.py

@@ -49,7 +49,7 @@
         ]),
     ],
     'install_requires': [
-        'ipywidgets>=7.0.0',
+        'ipywidgets>=7,<8',
         'ipydatawidgets>=1.1.1'
     ],
     'packages': find_packages(),

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