From 3ae37b4b836f3fc926a3b60725fae7798168060d Mon Sep 17 00:00:00 2001 From: Wolf Vollprecht Date: Tue, 20 Apr 2021 21:03:48 +0200 Subject: [PATCH 1/2] release 0.5.0, restore notebook functionality --- .gitignore | 2 +- js/lib/defaults.js | 124 +++++++++++++++++++-------------------- js/lib/extension.js | 4 +- js/lib/labplugin.js | 4 +- js/package.json | 6 +- js/webpack.config.js | 10 ++-- js/yarn.lock | 34 +++++------ jupyros/__init__.py | 6 +- jupyros/_version.py | 2 +- jupyros/jupyter-ros.json | 2 +- jupyros/ros3d.py | 4 +- setup.py | 16 ++--- 12 files changed, 109 insertions(+), 105 deletions(-) diff --git a/.gitignore b/.gitignore index 25593f1..2f747a6 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ node_modules/ # Compiled javascript *.map dist/ -jupyros/static/ +jupyros/nbextension/ jupyros/labextension/ # Examples diff --git a/js/lib/defaults.js b/js/lib/defaults.js index 6c809e1..d8663e0 100644 --- a/js/lib/defaults.js +++ b/js/lib/defaults.js @@ -1,7 +1,7 @@ var DepthCloudModelDefaults = { - _model_module: "jupyter-ros", - _model_module_version: "^0.4.1", + _model_module: "@robostack/jupyter-ros", + _model_module_version: "^0.5.0", _model_name: "DepthCloudModel", f: 525.0, url: "", @@ -10,11 +10,11 @@ var DepthCloudModelDefaults = { var GridModelDefaults = { - _model_module: "jupyter-ros", - _model_module_version: "^0.4.1", + _model_module: "@robostack/jupyter-ros", + _model_module_version: "^0.5.0", _model_name: "GridModel", - _view_module: "jupyter-ros", - _view_module_version: "^0.4.1", + _view_module: "@robostack/jupyter-ros", + _view_module_version: "^0.5.0", _view_name: "GridView", cell_size: 0.5, color: "#0181c4", @@ -24,11 +24,11 @@ var GridModelDefaults = { var InteractiveMarkerModelDefaults = { - _model_module: "jupyter-ros", - _model_module_version: "^0.4.1", + _model_module: "@robostack/jupyter-ros", + _model_module_version: "^0.5.0", _model_name: "InteractiveMarkerModel", - _view_module: "jupyter-ros", - _view_module_version: "^0.4.1", + _view_module: "@robostack/jupyter-ros", + _view_module_version: "^0.5.0", _view_name: "InteractiveMarkerView", menu_font_size: "0.8em", ros: null, @@ -39,11 +39,11 @@ var InteractiveMarkerModelDefaults = { var LaserScanModelDefaults = { - _model_module: "jupyter-ros", - _model_module_version: "^0.4.1", + _model_module: "@robostack/jupyter-ros", + _model_module_version: "^0.5.0", _model_name: "LaserScanModel", - _view_module: "jupyter-ros", - _view_module_version: "^0.4.1", + _view_module: "@robostack/jupyter-ros", + _view_module_version: "^0.5.0", _view_name: "LaserScanView", color_map: "", color_source: "intensities", @@ -60,11 +60,11 @@ var LaserScanModelDefaults = { var MarkerModelDefaults = { - _model_module: "jupyter-ros", - _model_module_version: "^0.4.1", + _model_module: "@robostack/jupyter-ros", + _model_module_version: "^0.5.0", _model_name: "MarkerModel", - _view_module: "jupyter-ros", - _view_module_version: "^0.4.1", + _view_module: "@robostack/jupyter-ros", + _view_module_version: "^0.5.0", _view_name: "MarkerView", lifetime: 0.0, path: "/", @@ -76,11 +76,11 @@ var MarkerModelDefaults = { var MarkerArrayClientModelDefaults = { - _model_module: "jupyter-ros", - _model_module_version: "^0.4.1", + _model_module: "@robostack/jupyter-ros", + _model_module_version: "^0.5.0", _model_name: "MarkerArrayClientModel", - _view_module: "jupyter-ros", - _view_module_version: "^0.4.1", + _view_module: "@robostack/jupyter-ros", + _view_module_version: "^0.5.0", _view_name: "MarkerArrayClientView", path: "/", ros: null, @@ -91,11 +91,11 @@ var MarkerArrayClientModelDefaults = { var OccupancyGridModelDefaults = { - _model_module: "jupyter-ros", - _model_module_version: "^0.4.1", + _model_module: "@robostack/jupyter-ros", + _model_module_version: "^0.5.0", _model_name: "OccupancyGridModel", - _view_module: "jupyter-ros", - _view_module_version: "^0.4.1", + _view_module: "@robostack/jupyter-ros", + _view_module_version: "^0.5.0", _view_name: "OccupancyGridView", color: "#FFFFFF", compression: "cbor", @@ -109,11 +109,11 @@ var OccupancyGridModelDefaults = { var PathModelDefaults = { - _model_module: "jupyter-ros", - _model_module_version: "^0.4.1", + _model_module: "@robostack/jupyter-ros", + _model_module_version: "^0.5.0", _model_name: "PathModel", - _view_module: "jupyter-ros", - _view_module_version: "^0.4.1", + _view_module: "@robostack/jupyter-ros", + _view_module_version: "^0.5.0", _view_name: "PathView", color: "#CC00FF", ros: null, @@ -124,11 +124,11 @@ var PathModelDefaults = { var PointCloudModelDefaults = { - _model_module: "jupyter-ros", - _model_module_version: "^0.4.1", + _model_module: "@robostack/jupyter-ros", + _model_module_version: "^0.5.0", _model_name: "PointCloudModel", - _view_module: "jupyter-ros", - _view_module_version: "^0.4.1", + _view_module: "@robostack/jupyter-ros", + _view_module_version: "^0.5.0", _view_name: "PointCloudView", max_points: 200000, message_ratio: 2.0, @@ -143,11 +143,11 @@ var PointCloudModelDefaults = { var PolygonModelDefaults = { - _model_module: "jupyter-ros", - _model_module_version: "^0.4.1", + _model_module: "@robostack/jupyter-ros", + _model_module_version: "^0.5.0", _model_name: "PolygonModel", - _view_module: "jupyter-ros", - _view_module_version: "^0.4.1", + _view_module: "@robostack/jupyter-ros", + _view_module_version: "^0.5.0", _view_name: "PolygonView", color: "#CC00FF", ros: null, @@ -158,11 +158,11 @@ var PolygonModelDefaults = { var PoseModelDefaults = { - _model_module: "jupyter-ros", - _model_module_version: "^0.4.1", + _model_module: "@robostack/jupyter-ros", + _model_module_version: "^0.5.0", _model_name: "PoseModel", - _view_module: "jupyter-ros", - _view_module_version: "^0.4.1", + _view_module: "@robostack/jupyter-ros", + _view_module_version: "^0.5.0", _view_name: "PoseView", color: "#CC00FF", length: 1.0, @@ -174,11 +174,11 @@ var PoseModelDefaults = { var PoseArrayModelDefaults = { - _model_module: "jupyter-ros", - _model_module_version: "^0.4.1", + _model_module: "@robostack/jupyter-ros", + _model_module_version: "^0.5.0", _model_name: "PoseArrayModel", - _view_module: "jupyter-ros", - _view_module_version: "^0.4.1", + _view_module: "@robostack/jupyter-ros", + _view_module_version: "^0.5.0", _view_name: "PoseArrayView", color: "#CC00FF", length: 1.0, @@ -190,8 +190,8 @@ var PoseArrayModelDefaults = { var ROSConnectionModelDefaults = { - _model_module: "jupyter-ros", - _model_module_version: "^0.4.1", + _model_module: "@robostack/jupyter-ros", + _model_module_version: "^0.5.0", _model_name: "ROSConnectionModel", url: "ws://{hostname}:9090", } @@ -199,11 +199,11 @@ var ROSConnectionModelDefaults = { var SceneNodeModelDefaults = { - _model_module: "jupyter-ros", - _model_module_version: "^0.4.1", + _model_module: "@robostack/jupyter-ros", + _model_module_version: "^0.5.0", _model_name: "SceneNodeModel", - _view_module: "jupyter-ros", - _view_module_version: "^0.4.1", + _view_module: "@robostack/jupyter-ros", + _view_module_version: "^0.5.0", _view_name: "SceneNodeView", frame_id: "/base_link", object: null, @@ -213,8 +213,8 @@ var SceneNodeModelDefaults = { var TFClientModelDefaults = { - _model_module: "jupyter-ros", - _model_module_version: "^0.4.1", + _model_module: "@robostack/jupyter-ros", + _model_module_version: "^0.5.0", _model_name: "TFClientModel", angular_treshold: 0.01, fixed_frame: "", @@ -226,11 +226,11 @@ var TFClientModelDefaults = { var URDFModelDefaults = { - _model_module: "jupyter-ros", - _model_module_version: "^0.4.1", + _model_module: "@robostack/jupyter-ros", + _model_module_version: "^0.5.0", _model_name: "URDFModel", - _view_module: "jupyter-ros", - _view_module_version: "^0.4.1", + _view_module: "@robostack/jupyter-ros", + _view_module_version: "^0.5.0", _view_name: "URDFView", ros: null, tf_client: null, @@ -240,11 +240,11 @@ var URDFModelDefaults = { var ViewerModelDefaults = { - _model_module: "jupyter-ros", - _model_module_version: "^0.4.1", + _model_module: "@robostack/jupyter-ros", + _model_module_version: "^0.5.0", _model_name: "ViewerModel", - _view_module: "jupyter-ros", - _view_module_version: "^0.4.1", + _view_module: "@robostack/jupyter-ros", + _view_module_version: "^0.5.0", _view_name: "ViewerView", alpha: 1.0, background_color: "#FFFFFF", diff --git a/js/lib/extension.js b/js/lib/extension.js index 4b2a093..873e776 100644 --- a/js/lib/extension.js +++ b/js/lib/extension.js @@ -13,7 +13,7 @@ // Some static assets may be required by the custom widget javascript. The base // url for the notebook is not known at build time and is therefore computed // dynamically. -__webpack_public_path__ = document.querySelector('body').getAttribute('data-base-url') + 'nbextensions/jupyter-ros'; +__webpack_public_path__ = document.querySelector('body').getAttribute('data-base-url') + 'nbextensions/@robostack/jupyter-ros'; // Configure requirejs @@ -21,7 +21,7 @@ if (window.require) { window.require.config({ map: { "*" : { - "jupyter-ros": "nbextensions/jupyter-ros/index", + "@robostack/jupyter-ros": "nbextensions/@robostack/jupyter-ros/index", } } }); diff --git a/js/lib/labplugin.js b/js/lib/labplugin.js index 8ae677b..9fb7503 100644 --- a/js/lib/labplugin.js +++ b/js/lib/labplugin.js @@ -10,11 +10,11 @@ var index_module = require('./index.js'); var base = require('@jupyter-widgets/base'); module.exports = { - id: 'jupyter-ros', + id: '@robostack/jupyter-ros', requires: [base.IJupyterWidgetRegistry], activate: function(app, widgets) { widgets.registerWidget({ - name: 'jupyter-ros', + name: '@robostack/jupyter-ros', version: index_module.version, exports: index_module }); diff --git a/js/package.json b/js/package.json index 1e27777..6a076b2 100644 --- a/js/package.json +++ b/js/package.json @@ -1,6 +1,6 @@ { "name": "@robostack/jupyter-ros", - "version": "0.4.1", + "version": "0.5.0", "description": "Jupyter widgets for the ROS ecosystem.", "author": "Wolf Vollprecht", "main": "lib/labplugin.js", @@ -20,7 +20,7 @@ "dist/*.js" ], "scripts": { - "clean": "rimraf dist/ ../jupyros/static ../jupyros/labextension", + "clean": "rimraf dist/ ../jupyros/nbextension ../jupyros/labextension", "build": "jlpm run clean && webpack", "build:labextension": "jlpm run build && jupyter labextension build .", "watch": "run-p watch:src && watch:labextension", @@ -37,7 +37,7 @@ "webpack-cli": "^4" }, "dependencies": { - "@jupyter-widgets/base": "^2.0.1 || ^3 || ^4.0.0", + "@jupyter-widgets/base": "^2.0.1 || ^3 || ^4", "lodash": "^4.17.4", "ros3d": "^1.0.0" }, diff --git a/js/webpack.config.js b/js/webpack.config.js index d008fa7..77905cc 100644 --- a/js/webpack.config.js +++ b/js/webpack.config.js @@ -15,7 +15,7 @@ var local_loaders = { ] } -const STATIC_PATH = path.resolve(__dirname, '../jupyros/static'); +const STATIC_PATH = path.resolve(__dirname, '../jupyros/nbextension'); const DIST_PATH = path.resolve(__dirname, 'dist'); module.exports = [ @@ -31,7 +31,8 @@ module.exports = [ output: { filename: 'extension.js', path: STATIC_PATH, - libraryTarget: 'amd' + libraryTarget: 'amd', + publicPath: '', }, resolveLoader: local_loaders }, @@ -45,7 +46,8 @@ module.exports = [ output: { filename: 'index.js', path: STATIC_PATH, - libraryTarget: 'amd' + libraryTarget: 'amd', + publicPath: '', }, devtool: 'source-map', module: { @@ -73,7 +75,7 @@ module.exports = [ filename: 'index.js', path: DIST_PATH, libraryTarget: 'amd', - publicPath: 'https://unpkg.com/jupyter-ros@' + version + '/dist/' + publicPath: 'https://unpkg.com/@robostack/jupyter-ros@' + version + '/dist/' }, devtool: 'source-map', module: { diff --git a/js/yarn.lock b/js/yarn.lock index 598eb59..9ff9c41 100644 --- a/js/yarn.lock +++ b/js/yarn.lock @@ -7,9 +7,9 @@ resolved "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz" integrity sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg== -"@jupyter-widgets/base@^2.0.1 || ^3 || ^4.0.0": +"@jupyter-widgets/base@^2.0.1 || ^3 || ^4": version "4.0.0" - resolved "https://registry.yarnpkg.com/@jupyter-widgets/base/-/base-4.0.0.tgz#6935461a3bd78df5523022e1c3d370ae24c9a454" + resolved "https://registry.npmjs.org/@jupyter-widgets/base/-/base-4.0.0.tgz" integrity sha512-lBQgLYzq6C+XjfVJTidk+rckKo/+xlTgIm1XUtACA3BUz8bgi2du2zmbYkcrplJMwGub4QWP6GnKgM5ZZRhzYg== dependencies: "@jupyterlab/services" "^6.0.0" @@ -84,7 +84,7 @@ "@jupyterlab/coreutils@^5.0.2": version "5.0.2" - resolved "https://registry.yarnpkg.com/@jupyterlab/coreutils/-/coreutils-5.0.2.tgz#e1845cb05d228179babccf1a3cbfde8abe456113" + resolved "https://registry.npmjs.org/@jupyterlab/coreutils/-/coreutils-5.0.2.tgz" integrity sha512-ViQoYjROvzfU2PuuH9kYpbBReIZafKcmJFEEflgf2fH6IW298tXQgNcT+dQiq8FjmyEVApoQM8r2pI1d1ztVPA== dependencies: "@lumino/coreutils" "^1.5.3" @@ -97,14 +97,14 @@ "@jupyterlab/nbformat@^3.0.2": version "3.0.2" - resolved "https://registry.yarnpkg.com/@jupyterlab/nbformat/-/nbformat-3.0.2.tgz#0e7509c25a0ab994348e77332f81406296a03623" + resolved "https://registry.npmjs.org/@jupyterlab/nbformat/-/nbformat-3.0.2.tgz" integrity sha512-MYkUF4rkr/qhNQ2auvLYmVRwl39eIGRT1oJctCeiN2sTNtl5f1bts8KuNRhkYDOuryJUwouI1T4JsQpcE+mV6Q== dependencies: "@lumino/coreutils" "^1.5.3" "@jupyterlab/observables@^4.0.2": version "4.0.2" - resolved "https://registry.yarnpkg.com/@jupyterlab/observables/-/observables-4.0.2.tgz#a76256cf3afc23ace90a9f4e8ad96c8f2f398abf" + resolved "https://registry.npmjs.org/@jupyterlab/observables/-/observables-4.0.2.tgz" integrity sha512-eLS0ThHEfM86eUeLHSLgjpf7BrRmgJJTTarn3FJSC0CVXVzx48Fcsvpa5mhbnWjSakzUT+LqbN4w4lFZabwz8A== dependencies: "@lumino/algorithm" "^1.3.3" @@ -115,7 +115,7 @@ "@jupyterlab/services@^6.0.0": version "6.0.3" - resolved "https://registry.yarnpkg.com/@jupyterlab/services/-/services-6.0.3.tgz#60b65555fc1ab69065b9bee1892329b02a9ad607" + resolved "https://registry.npmjs.org/@jupyterlab/services/-/services-6.0.3.tgz" integrity sha512-jgzJPDOMIMVTr57ZRWmeWZRICyyUyumR4HPMjf6BrB6RXytL1JZ/2m9qs1dX2zReAwWHV6bGVu/kZ/Hmqk9aiA== dependencies: "@jupyterlab/coreutils" "^5.0.2" @@ -133,7 +133,7 @@ "@jupyterlab/settingregistry@^3.0.2": version "3.0.2" - resolved "https://registry.yarnpkg.com/@jupyterlab/settingregistry/-/settingregistry-3.0.2.tgz#c64343b42de96b016df766cecdb3b97c6fca62c2" + resolved "https://registry.npmjs.org/@jupyterlab/settingregistry/-/settingregistry-3.0.2.tgz" integrity sha512-M0ZPazePn5Jw8HX2H1t+I6ZgvsGYeTOonjlKoiDgkR178whYMZ7LdkTpUuX3fyEkhZ6aHpmrboXtw/H8TJiE+w== dependencies: "@jupyterlab/statedb" "^3.0.2" @@ -146,7 +146,7 @@ "@jupyterlab/statedb@^3.0.2": version "3.0.2" - resolved "https://registry.yarnpkg.com/@jupyterlab/statedb/-/statedb-3.0.2.tgz#6b0a99daa88d2054b42267d563c5e5588fd31371" + resolved "https://registry.npmjs.org/@jupyterlab/statedb/-/statedb-3.0.2.tgz" integrity sha512-PILxap9OT8wUPNzS5/PpCMcGwgn5nrPkDURhmpOASaDWYkCfG72UzZP5H8ZpeZ5iV+Nf8/eg5WtJP66twEKnjA== dependencies: "@lumino/commands" "^1.12.0" @@ -191,7 +191,7 @@ "@lumino/coreutils@^1.2.0", "@lumino/coreutils@^1.5.3": version "1.5.3" - resolved "https://registry.yarnpkg.com/@lumino/coreutils/-/coreutils-1.5.3.tgz#89dd7b7f381642a1bf568910c5b62c7bde705d71" + resolved "https://registry.npmjs.org/@lumino/coreutils/-/coreutils-1.5.3.tgz" integrity sha512-G72jJ6sgOwAUuilz+cri7LpHIJxllK+qz+YZUC3fyyWHK7oRlZemcc43jZAVE+tagTdMxKYSQWNIVzM5lI8sWw== "@lumino/disposable@^1.4.3": @@ -222,7 +222,7 @@ "@lumino/messaging@^1.2.1", "@lumino/messaging@^1.4.3": version "1.4.3" - resolved "https://registry.yarnpkg.com/@lumino/messaging/-/messaging-1.4.3.tgz#75a1901f53086c7c0e978a63cb784eae5cc59f3f" + resolved "https://registry.npmjs.org/@lumino/messaging/-/messaging-1.4.3.tgz" integrity sha512-wa2Pj2KOuLNLS2n0wVBzUVFGbvjL1FLbuCOAUEYfN6xXVleqqtGGzd08uTF7ebu01KCO3VQ38+dkvoaM/C2qPw== dependencies: "@lumino/algorithm" "^1.3.3" @@ -230,7 +230,7 @@ "@lumino/polling@^1.3.3": version "1.3.3" - resolved "https://registry.yarnpkg.com/@lumino/polling/-/polling-1.3.3.tgz#6336638cb9ba2f4f4c3ef2529c7f260abbd25148" + resolved "https://registry.npmjs.org/@lumino/polling/-/polling-1.3.3.tgz" integrity sha512-uMRi6sPRnKW8m38WUY3qox1jxwzpvceafUbDJATCwyrZ48+YoY5Fxfmd9dqwioHS1aq9np5c6L35a9ZGuS0Maw== dependencies: "@lumino/coreutils" "^1.5.3" @@ -258,7 +258,7 @@ "@lumino/widgets@^1.16.1", "@lumino/widgets@^1.18.0", "@lumino/widgets@^1.3.0": version "1.18.0" - resolved "https://registry.yarnpkg.com/@lumino/widgets/-/widgets-1.18.0.tgz#fa8ce727126a1e91b9f3ba78e08425115046e3ac" + resolved "https://registry.npmjs.org/@lumino/widgets/-/widgets-1.18.0.tgz" integrity sha512-8i10njkGjctuXrbaoV2dRI2rVUaL7eA5djtHj36pX9cALwciEPHNecF6hoZXmQ4ODv6LTwhr87Uz8LT4Aan77A== dependencies: "@lumino/algorithm" "^1.3.3" @@ -1681,7 +1681,7 @@ jest-worker@^26.5.0, jest-worker@^26.6.2: jquery@^3.1.1: version "3.5.1" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5" + resolved "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz" integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg== json-buffer@3.0.0: @@ -1708,7 +1708,7 @@ json5@^1.0.1: json5@^2.1.1: version "2.2.0" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" + resolved "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz" integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== dependencies: minimist "^1.2.5" @@ -1959,7 +1959,7 @@ nice-try@^1.0.4: node-fetch@^2.6.0: version "2.6.1" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" + resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz" integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== node-releases@^1.1.69: @@ -2900,7 +2900,7 @@ url-parse-lax@^3.0.0: url-parse@~1.4.7: version "1.4.7" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278" + resolved "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz" integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg== dependencies: querystringify "^2.1.1" @@ -3048,7 +3048,7 @@ ws@^3.3.1: ws@^7.2.0: version "7.4.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.3.tgz#1f9643de34a543b8edb124bdcbc457ae55a6e5cd" + resolved "https://registry.npmjs.org/ws/-/ws-7.4.3.tgz" integrity sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA== ws@~6.1.0: diff --git a/jupyros/__init__.py b/jupyros/__init__.py index c2d5134..533e0f4 100644 --- a/jupyros/__init__.py +++ b/jupyros/__init__.py @@ -18,9 +18,9 @@ def _jupyter_nbextension_paths(): return [{ 'section': 'notebook', - 'src': 'static', - 'dest': 'jupyter-ros', - 'require': 'jupyter-ros/extension' + 'src': 'nbextension', + 'dest': '@robostack/jupyter-ros', + 'require': '@robostack/jupyter-ros/extension' }] def _jupyter_labextension_paths(): diff --git a/jupyros/_version.py b/jupyros/_version.py index b2da224..6e3c0f3 100644 --- a/jupyros/_version.py +++ b/jupyros/_version.py @@ -6,7 +6,7 @@ # The full license is in the file LICENSE, distributed with this software. # ############################################################################# -version_info = (0, 4, 1, 'final', 0) +version_info = (0, 5, 0, 'final', 0) _specifier_ = {'alpha': 'a', 'beta': 'b', 'candidate': 'rc', 'final': ''} diff --git a/jupyros/jupyter-ros.json b/jupyros/jupyter-ros.json index 3667e22..44ca317 100644 --- a/jupyros/jupyter-ros.json +++ b/jupyros/jupyter-ros.json @@ -1,5 +1,5 @@ { "load_extensions": { - "jupyter-ros/extension": true + "@robostack/jupyter-ros/extension": true } } diff --git a/jupyros/ros3d.py b/jupyros/ros3d.py index ea19550..4b7f5df 100644 --- a/jupyros/ros3d.py +++ b/jupyros/ros3d.py @@ -51,8 +51,8 @@ def quick_widget_decorator(cls): return quick_widget_decorator -register = _quick_widget('jupyter-ros', js_version) -register_noview = _quick_widget('jupyter-ros', js_version, False) +register = _quick_widget('@robostack/jupyter-ros', js_version) +register_noview = _quick_widget('@robostack/jupyter-ros', js_version, False) sync_widget = {'sync': True} sync_widget.update(widgets.widget_serialization) diff --git a/setup.py b/setup.py index 3c40586..58a6c25 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ # The name of the project name = 'jupyros' -nb_ext_name = 'jupyter-ros' +nb_ext_name = '@robostack/jupyter-ros' ext_name = '@robostack/jupyter-ros' HERE = path.dirname(path.abspath(__file__)) @@ -38,22 +38,24 @@ # Extensions' path module_path = path.join(HERE, name) -nb_path = path.join(HERE, name, 'static') +nb_path = path.join(HERE, name, 'nbextension') lab_path = path.join(HERE, name, 'labextension') + cmdclass = create_cmdclass( 'js', package_data_spec = { name: [ - 'static/*', + 'nbextension/*', 'labextension/*' ] }, data_files_spec = [ - ('share/jupyter/nbextensions/' + nb_ext_name, nb_path, '**'), - ('etc/jupyter/nbconfig/notebook.d', name, 'jupyter-ros.json'), - ("share/jupyter/labextensions/" + ext_name, lab_path, "**"), - ('etc/jupyter/jupyter_notebook_config.d', name, 'jupyros_server_extension.json') + ('share/jupyter/nbextensions/' + nb_ext_name, "jupyros/nbextension", '*.*'), + ("share/jupyter/labextensions/" + ext_name, "jupyros/labextension", "**"), + ("share/jupyter/labextensions/" + ext_name, ".", "install.json"), + ('etc/jupyter/nbconfig/notebook.d', "jupyros", 'jupyter-ros.json'), + ('etc/jupyter/jupyter_notebook_config.d', "jupyros", 'jupyros_server_extension.json') ] ) From 723789343230ef1c05286804b9b04bef447c8cc8 Mon Sep 17 00:00:00 2001 From: Wolf Vollprecht Date: Tue, 20 Apr 2021 21:04:07 +0200 Subject: [PATCH 2/2] add install.json for jupyterlab --- install.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 install.json diff --git a/install.json b/install.json new file mode 100644 index 0000000..4ddb17e --- /dev/null +++ b/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyros", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyros / jupyter-ros" +} \ No newline at end of file