From 19297e04dc1d52b00d7c11daa171882b8de9a487 Mon Sep 17 00:00:00 2001 From: Jason Grout Date: Fri, 27 Oct 2017 13:37:41 -0700 Subject: [PATCH 1/5] 0.4.1 pythreejs now uses numpy, so add it to the required packages. pythreejs-0.4.1.tar.gz md5: 8280ab2600a5455567bc53787b54725c sha1: 0340826d2fed8705f016e874e4d7527f18a4dc91 sha256: 6e15645dc8cf006fb9bda69fd274475bb9df5d164d3ed1c63d41f8d68b154c57 --- pythreejs/_version.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pythreejs/_version.py b/pythreejs/_version.py index 713e923d..733f2283 100644 --- a/pythreejs/_version.py +++ b/pythreejs/_version.py @@ -1,4 +1,4 @@ -version_info = (0, 4, 0, 'final', 0) +version_info = (0, 4, 1, 'final', 0) _specifier_ = {'alpha': 'a', 'beta': 'b', 'candidate': 'rc', 'final': ''} diff --git a/setup.py b/setup.py index cbe5d281..091240d5 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ 'pythreejs/static/index.js.map', ]), ], - 'install_requires': ['ipywidgets>=7,<8', 'traittypes'], + 'install_requires': ['ipywidgets>=7,<8', 'numpy', 'traittypes'], 'packages': find_packages(), 'zip_safe': False, 'cmdclass': cmdclass, From 4d1eac5be8406cb60bfcddf6a80fd70bf7506cc6 Mon Sep 17 00:00:00 2001 From: Sylvain Corlay Date: Mon, 6 Nov 2017 00:55:11 +0100 Subject: [PATCH 2/5] Move JupyterLab plugin to main npm package --- js/package.json | 5 ++++- .../index.js => js/src/jupyterlab-plugin.js | 6 +++--- jslab/package.json | 18 ------------------ pythreejs/_version.py | 2 +- 4 files changed, 8 insertions(+), 23 deletions(-) rename jslab/lib/index.js => js/src/jupyterlab-plugin.js (61%) delete mode 100644 jslab/package.json diff --git a/js/package.json b/js/package.json index a72e2641..aca4e55b 100644 --- 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/jslab/lib/index.js b/js/src/jupyterlab-plugin.js similarity index 61% rename from jslab/lib/index.js rename to js/src/jupyterlab-plugin.js index 4f54332f..8bab62bf 100644 --- a/jslab/lib/index.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 deleted file mode 100644 index 1e31c43d..00000000 --- a/jslab/package.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "jupyterlab-threejs", - "version": "0.2.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.27.0", - "jupyter-threejs": "^0.4.0" - }, - "jupyterlab": { - "extension": true - } -} diff --git a/pythreejs/_version.py b/pythreejs/_version.py index 733f2283..af1d5434 100644 --- 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' From 79df16bdb65af80f2b3b0d57d10465f81e07d56a Mon Sep 17 00:00:00 2001 From: Sylvain Corlay Date: Mon, 6 Nov 2017 01:05:07 +0100 Subject: [PATCH 3/5] Fixup semver requirement --- pythreejs/pythreejs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pythreejs/pythreejs.py b/pythreejs/pythreejs.py index 922c11ab..d56cba7e 100644 --- a/pythreejs/pythreejs.py +++ b/pythreejs/pythreejs.py @@ -38,7 +38,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.3.0-alpha.0' +PYTHREEJS_VERSION='0.4.1' class Texture(Widget): _view_module = Unicode(npm_pkg_name).tag(sync=True) From 6b171ad1aa463994b2e5040830acf20bba879c17 Mon Sep 17 00:00:00 2001 From: Sylvain Corlay Date: Thu, 18 Jan 2018 09:01:29 +0100 Subject: [PATCH 4/5] update three dependency --- js/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/package.json b/js/package.json index aca4e55b..4339ff80 100644 --- a/js/package.json +++ b/js/package.json @@ -21,7 +21,7 @@ "dependencies": { "@jupyter-widgets/base": "^1.0.0", "ndarray": "^1.0.18", - "three": "^0.75.0", + "three": "^0.85.0", "underscore": "^1.8.3" }, "jupyterlab": { From 8b62adf8bdbd7542d249ae7da89a5ab224780d76 Mon Sep 17 00:00:00 2001 From: Sylvain Corlay Date: Thu, 18 Jan 2018 09:04:01 +0100 Subject: [PATCH 5/5] Release 0.4.2 --- pythreejs/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pythreejs/_version.py b/pythreejs/_version.py index af1d5434..aa465eac 100644 --- a/pythreejs/_version.py +++ b/pythreejs/_version.py @@ -1,4 +1,4 @@ -version_info = (0, 4, 1, 'final', 0) +version_info = (0, 4, 2, 'final', 0) _specifier_ = {'alpha': 'a', 'beta': 'b', 'candidate': 'rc', 'final': ''}