nglview 1.1.2

nglviewer · Mar 23, 2018 · cef1668 · cef1668
1 parent fa05253
commit cef1668
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -100,11 +100,8 @@ The development version can be installed directly from github:
     # tested with ipywidgets 5.2.2, notebook 4.2.1
 ```
 ### jupyterlab user
-HIGHLY EXPERIMENTAL. Things might not work as you are expecting.
-```
-# Please read its content before running
-source devtools/nglview-jupyterlab.sh
-```
+
+Not supported yet.
 
 Example
 =======

diff --git a/devtools/nglview-jupyterlab.sh → devtools/outdated/nglview-jupyterlab.sh b/devtools/nglview-jupyterlab.sh → devtools/outdated/nglview-jupyterlab.sh
diff --git a/js/package.json b/js/package.json
@@ -1,10 +1,10 @@
 {
   "name": "nglview-js-widgets",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "nglview-js-widgets",
   "author": "Hai Nguyen <hainm.comp@gmail.com>, Alexander Rose <alexander.rose@weirdbyte.de>",
   "license": "MIT",
-  "main": "dist/index.js",
+  "main": "src/index.js",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/arose/nglview.git"
@@ -13,7 +13,8 @@
     "url": "https://github.com/arose/nglview/issues"
   },
   "files": [
-    "dist"
+    "dist",
+    "src"
   ],
   "keywords": [
     "molecular graphics",
@@ -45,7 +46,11 @@
     "jquery": "^3.2.1",
     "jquery-ui": "^1.12.1",
     "underscore": "^1.8.3",
-    "@jupyter-widgets/base": "^0.5.2"
+    "ngl": "^2.0.0-dev.28",
+    "@jupyter-widgets/base": "^1.0.0"
+  },
+  "jupyterlab": {
+    "extension": "src/jupyterlab-plugin"
   },
   "homepage": "https://github.com/arose/nglview#readme",
   "directories": {

diff --git a/jslab/index.js → js/src/jupyterlab-plugin.js b/jslab/index.js → js/src/jupyterlab-plugin.js
@@ -1,11 +1,10 @@
-
-var nglview_js_widgets = require('nglview-js-widgets');
-var jupyterlab_widgets = require('@jupyter-widgets/jupyterlab-manager');
+var nglview_js_widgets = require('./index');
+var base = require('@jupyter-widgets/base');
 
 
 module.exports = {
   id: 'nglview-js-widgets',
-  requires: [jupyterlab_widgets.INBWidgetExtension],
+  requires: [base.IJupyterWidgetRegistry],
   activate: function(app, widgets) {
       widgets.registerWidget({
           name: 'nglview-js-widgets',

diff --git a/jslab/package.json b/jslab/package.json
diff --git a/nglview/static/index.js b/nglview/static/index.js
diff --git a/nglview/static/index.js.map b/nglview/static/index.js.map
diff --git a/nglview/tests/test_version.py b/nglview/tests/test_version.py
@@ -14,9 +14,3 @@ def test_make_sure_versions_matched():
                 break
     line = line.replace('module.exports =', '')
     assert json.loads(line)['version'] == nv.widget.__frontend_version__
-
-    # bakend and jslab
-    package_json = os.path.join(nglview_dir, '..', 'jslab', 'package.json')
-    with open(package_json) as fh:
-        assert json.loads(fh.read())['dependencies']['nglview-js-widgets'] == \
-                nv.widget.__frontend_version__
diff --git a/nglview/widget.py b/nglview/widget.py
@@ -28,7 +28,7 @@
 from .remote_thread import RemoteCallThread
 
 __all__ = ['NGLWidget', 'ComponentViewer']
-__frontend_version__ = '1.1.0' # must match to js/package.json and js/src/widget_ngl.js
+__frontend_version__ = '1.1.2' # must match to js/package.json and js/src/widget_ngl.js
 _EXCLUDED_CALLBACK_AFTER_FIRING = {
         'setUnSyncCamera', 'setSelector', 'setUnSyncFrame', 'setDelay',
         'autoView',