Skip to content

Commit 10511d6

Browse files
wolfvwolfv
authored
Merge pull request #74 from RoboStack/restore_notebook
2 parents a6afef5 + 7237893 commit 10511d6

13 files changed

+114
-105
lines changed

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ node_modules/
88
# Compiled javascript
99
*.map
1010
dist/
11-
jupyros/static/
11+
jupyros/nbextension/
1212
jupyros/labextension/
1313

1414
# Examples

‎install.json

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"packageManager": "python",
3+
"packageName": "jupyros",
4+
"uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyros / jupyter-ros"
5+
}

‎js/lib/defaults.js

+62-62
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
var DepthCloudModelDefaults = {
3-
_model_module: "jupyter-ros",
4-
_model_module_version: "^0.4.1",
3+
_model_module: "@robostack/jupyter-ros",
4+
_model_module_version: "^0.5.0",
55
_model_name: "DepthCloudModel",
66
f: 525.0,
77
url: "",
@@ -10,11 +10,11 @@ var DepthCloudModelDefaults = {
1010

1111

1212
var GridModelDefaults = {
13-
_model_module: "jupyter-ros",
14-
_model_module_version: "^0.4.1",
13+
_model_module: "@robostack/jupyter-ros",
14+
_model_module_version: "^0.5.0",
1515
_model_name: "GridModel",
16-
_view_module: "jupyter-ros",
17-
_view_module_version: "^0.4.1",
16+
_view_module: "@robostack/jupyter-ros",
17+
_view_module_version: "^0.5.0",
1818
_view_name: "GridView",
1919
cell_size: 0.5,
2020
color: "#0181c4",
@@ -24,11 +24,11 @@ var GridModelDefaults = {
2424

2525

2626
var InteractiveMarkerModelDefaults = {
27-
_model_module: "jupyter-ros",
28-
_model_module_version: "^0.4.1",
27+
_model_module: "@robostack/jupyter-ros",
28+
_model_module_version: "^0.5.0",
2929
_model_name: "InteractiveMarkerModel",
30-
_view_module: "jupyter-ros",
31-
_view_module_version: "^0.4.1",
30+
_view_module: "@robostack/jupyter-ros",
31+
_view_module_version: "^0.5.0",
3232
_view_name: "InteractiveMarkerView",
3333
menu_font_size: "0.8em",
3434
ros: null,
@@ -39,11 +39,11 @@ var InteractiveMarkerModelDefaults = {
3939

4040

4141
var LaserScanModelDefaults = {
42-
_model_module: "jupyter-ros",
43-
_model_module_version: "^0.4.1",
42+
_model_module: "@robostack/jupyter-ros",
43+
_model_module_version: "^0.5.0",
4444
_model_name: "LaserScanModel",
45-
_view_module: "jupyter-ros",
46-
_view_module_version: "^0.4.1",
45+
_view_module: "@robostack/jupyter-ros",
46+
_view_module_version: "^0.5.0",
4747
_view_name: "LaserScanView",
4848
color_map: "",
4949
color_source: "intensities",
@@ -60,11 +60,11 @@ var LaserScanModelDefaults = {
6060

6161

6262
var MarkerModelDefaults = {
63-
_model_module: "jupyter-ros",
64-
_model_module_version: "^0.4.1",
63+
_model_module: "@robostack/jupyter-ros",
64+
_model_module_version: "^0.5.0",
6565
_model_name: "MarkerModel",
66-
_view_module: "jupyter-ros",
67-
_view_module_version: "^0.4.1",
66+
_view_module: "@robostack/jupyter-ros",
67+
_view_module_version: "^0.5.0",
6868
_view_name: "MarkerView",
6969
lifetime: 0.0,
7070
path: "/",
@@ -76,11 +76,11 @@ var MarkerModelDefaults = {
7676

7777

7878
var MarkerArrayClientModelDefaults = {
79-
_model_module: "jupyter-ros",
80-
_model_module_version: "^0.4.1",
79+
_model_module: "@robostack/jupyter-ros",
80+
_model_module_version: "^0.5.0",
8181
_model_name: "MarkerArrayClientModel",
82-
_view_module: "jupyter-ros",
83-
_view_module_version: "^0.4.1",
82+
_view_module: "@robostack/jupyter-ros",
83+
_view_module_version: "^0.5.0",
8484
_view_name: "MarkerArrayClientView",
8585
path: "/",
8686
ros: null,
@@ -91,11 +91,11 @@ var MarkerArrayClientModelDefaults = {
9191

9292

9393
var OccupancyGridModelDefaults = {
94-
_model_module: "jupyter-ros",
95-
_model_module_version: "^0.4.1",
94+
_model_module: "@robostack/jupyter-ros",
95+
_model_module_version: "^0.5.0",
9696
_model_name: "OccupancyGridModel",
97-
_view_module: "jupyter-ros",
98-
_view_module_version: "^0.4.1",
97+
_view_module: "@robostack/jupyter-ros",
98+
_view_module_version: "^0.5.0",
9999
_view_name: "OccupancyGridView",
100100
color: "#FFFFFF",
101101
compression: "cbor",
@@ -109,11 +109,11 @@ var OccupancyGridModelDefaults = {
109109

110110

111111
var PathModelDefaults = {
112-
_model_module: "jupyter-ros",
113-
_model_module_version: "^0.4.1",
112+
_model_module: "@robostack/jupyter-ros",
113+
_model_module_version: "^0.5.0",
114114
_model_name: "PathModel",
115-
_view_module: "jupyter-ros",
116-
_view_module_version: "^0.4.1",
115+
_view_module: "@robostack/jupyter-ros",
116+
_view_module_version: "^0.5.0",
117117
_view_name: "PathView",
118118
color: "#CC00FF",
119119
ros: null,
@@ -124,11 +124,11 @@ var PathModelDefaults = {
124124

125125

126126
var PointCloudModelDefaults = {
127-
_model_module: "jupyter-ros",
128-
_model_module_version: "^0.4.1",
127+
_model_module: "@robostack/jupyter-ros",
128+
_model_module_version: "^0.5.0",
129129
_model_name: "PointCloudModel",
130-
_view_module: "jupyter-ros",
131-
_view_module_version: "^0.4.1",
130+
_view_module: "@robostack/jupyter-ros",
131+
_view_module_version: "^0.5.0",
132132
_view_name: "PointCloudView",
133133
max_points: 200000,
134134
message_ratio: 2.0,
@@ -143,11 +143,11 @@ var PointCloudModelDefaults = {
143143

144144

145145
var PolygonModelDefaults = {
146-
_model_module: "jupyter-ros",
147-
_model_module_version: "^0.4.1",
146+
_model_module: "@robostack/jupyter-ros",
147+
_model_module_version: "^0.5.0",
148148
_model_name: "PolygonModel",
149-
_view_module: "jupyter-ros",
150-
_view_module_version: "^0.4.1",
149+
_view_module: "@robostack/jupyter-ros",
150+
_view_module_version: "^0.5.0",
151151
_view_name: "PolygonView",
152152
color: "#CC00FF",
153153
ros: null,
@@ -158,11 +158,11 @@ var PolygonModelDefaults = {
158158

159159

160160
var PoseModelDefaults = {
161-
_model_module: "jupyter-ros",
162-
_model_module_version: "^0.4.1",
161+
_model_module: "@robostack/jupyter-ros",
162+
_model_module_version: "^0.5.0",
163163
_model_name: "PoseModel",
164-
_view_module: "jupyter-ros",
165-
_view_module_version: "^0.4.1",
164+
_view_module: "@robostack/jupyter-ros",
165+
_view_module_version: "^0.5.0",
166166
_view_name: "PoseView",
167167
color: "#CC00FF",
168168
length: 1.0,
@@ -174,11 +174,11 @@ var PoseModelDefaults = {
174174

175175

176176
var PoseArrayModelDefaults = {
177-
_model_module: "jupyter-ros",
178-
_model_module_version: "^0.4.1",
177+
_model_module: "@robostack/jupyter-ros",
178+
_model_module_version: "^0.5.0",
179179
_model_name: "PoseArrayModel",
180-
_view_module: "jupyter-ros",
181-
_view_module_version: "^0.4.1",
180+
_view_module: "@robostack/jupyter-ros",
181+
_view_module_version: "^0.5.0",
182182
_view_name: "PoseArrayView",
183183
color: "#CC00FF",
184184
length: 1.0,
@@ -190,20 +190,20 @@ var PoseArrayModelDefaults = {
190190

191191

192192
var ROSConnectionModelDefaults = {
193-
_model_module: "jupyter-ros",
194-
_model_module_version: "^0.4.1",
193+
_model_module: "@robostack/jupyter-ros",
194+
_model_module_version: "^0.5.0",
195195
_model_name: "ROSConnectionModel",
196196
url: "ws://{hostname}:9090",
197197
}
198198

199199

200200

201201
var SceneNodeModelDefaults = {
202-
_model_module: "jupyter-ros",
203-
_model_module_version: "^0.4.1",
202+
_model_module: "@robostack/jupyter-ros",
203+
_model_module_version: "^0.5.0",
204204
_model_name: "SceneNodeModel",
205-
_view_module: "jupyter-ros",
206-
_view_module_version: "^0.4.1",
205+
_view_module: "@robostack/jupyter-ros",
206+
_view_module_version: "^0.5.0",
207207
_view_name: "SceneNodeView",
208208
frame_id: "/base_link",
209209
object: null,
@@ -213,8 +213,8 @@ var SceneNodeModelDefaults = {
213213

214214

215215
var TFClientModelDefaults = {
216-
_model_module: "jupyter-ros",
217-
_model_module_version: "^0.4.1",
216+
_model_module: "@robostack/jupyter-ros",
217+
_model_module_version: "^0.5.0",
218218
_model_name: "TFClientModel",
219219
angular_treshold: 0.01,
220220
fixed_frame: "",
@@ -226,11 +226,11 @@ var TFClientModelDefaults = {
226226

227227

228228
var URDFModelDefaults = {
229-
_model_module: "jupyter-ros",
230-
_model_module_version: "^0.4.1",
229+
_model_module: "@robostack/jupyter-ros",
230+
_model_module_version: "^0.5.0",
231231
_model_name: "URDFModel",
232-
_view_module: "jupyter-ros",
233-
_view_module_version: "^0.4.1",
232+
_view_module: "@robostack/jupyter-ros",
233+
_view_module_version: "^0.5.0",
234234
_view_name: "URDFView",
235235
ros: null,
236236
tf_client: null,
@@ -240,11 +240,11 @@ var URDFModelDefaults = {
240240

241241

242242
var ViewerModelDefaults = {
243-
_model_module: "jupyter-ros",
244-
_model_module_version: "^0.4.1",
243+
_model_module: "@robostack/jupyter-ros",
244+
_model_module_version: "^0.5.0",
245245
_model_name: "ViewerModel",
246-
_view_module: "jupyter-ros",
247-
_view_module_version: "^0.4.1",
246+
_view_module: "@robostack/jupyter-ros",
247+
_view_module_version: "^0.5.0",
248248
_view_name: "ViewerView",
249249
alpha: 1.0,
250250
background_color: "#FFFFFF",

‎js/lib/extension.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
// Some static assets may be required by the custom widget javascript. The base
1414
// url for the notebook is not known at build time and is therefore computed
1515
// dynamically.
16-
__webpack_public_path__ = document.querySelector('body').getAttribute('data-base-url') + 'nbextensions/jupyter-ros';
16+
__webpack_public_path__ = document.querySelector('body').getAttribute('data-base-url') + 'nbextensions/@robostack/jupyter-ros';
1717

1818

1919
// Configure requirejs
2020
if (window.require) {
2121
window.require.config({
2222
map: {
2323
"*" : {
24-
"jupyter-ros": "nbextensions/jupyter-ros/index",
24+
"@robostack/jupyter-ros": "nbextensions/@robostack/jupyter-ros/index",
2525
}
2626
}
2727
});

‎js/lib/labplugin.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ var index_module = require('./index.js');
1010
var base = require('@jupyter-widgets/base');
1111

1212
module.exports = {
13-
id: 'jupyter-ros',
13+
id: '@robostack/jupyter-ros',
1414
requires: [base.IJupyterWidgetRegistry],
1515
activate: function(app, widgets) {
1616
widgets.registerWidget({
17-
name: 'jupyter-ros',
17+
name: '@robostack/jupyter-ros',
1818
version: index_module.version,
1919
exports: index_module
2020
});

‎js/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@robostack/jupyter-ros",
3-
"version": "0.4.1",
3+
"version": "0.5.0",
44
"description": "Jupyter widgets for the ROS ecosystem.",
55
"author": "Wolf Vollprecht",
66
"main": "lib/labplugin.js",
@@ -20,7 +20,7 @@
2020
"dist/*.js"
2121
],
2222
"scripts": {
23-
"clean": "rimraf dist/ ../jupyros/static ../jupyros/labextension",
23+
"clean": "rimraf dist/ ../jupyros/nbextension ../jupyros/labextension",
2424
"build": "jlpm run clean && webpack",
2525
"build:labextension": "jlpm run build && jupyter labextension build .",
2626
"watch": "run-p watch:src && watch:labextension",
@@ -37,7 +37,7 @@
3737
"webpack-cli": "^4"
3838
},
3939
"dependencies": {
40-
"@jupyter-widgets/base": "^2.0.1 || ^3 || ^4.0.0",
40+
"@jupyter-widgets/base": "^2.0.1 || ^3 || ^4",
4141
"lodash": "^4.17.4",
4242
"ros3d": "^1.0.0"
4343
},

‎js/webpack.config.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var local_loaders = {
1515
]
1616
}
1717

18-
const STATIC_PATH = path.resolve(__dirname, '../jupyros/static');
18+
const STATIC_PATH = path.resolve(__dirname, '../jupyros/nbextension');
1919
const DIST_PATH = path.resolve(__dirname, 'dist');
2020

2121
module.exports = [
@@ -31,7 +31,8 @@ module.exports = [
3131
output: {
3232
filename: 'extension.js',
3333
path: STATIC_PATH,
34-
libraryTarget: 'amd'
34+
libraryTarget: 'amd',
35+
publicPath: '',
3536
},
3637
resolveLoader: local_loaders
3738
},
@@ -45,7 +46,8 @@ module.exports = [
4546
output: {
4647
filename: 'index.js',
4748
path: STATIC_PATH,
48-
libraryTarget: 'amd'
49+
libraryTarget: 'amd',
50+
publicPath: '',
4951
},
5052
devtool: 'source-map',
5153
module: {
@@ -73,7 +75,7 @@ module.exports = [
7375
filename: 'index.js',
7476
path: DIST_PATH,
7577
libraryTarget: 'amd',
76-
publicPath: 'https://unpkg.com/jupyter-ros@' + version + '/dist/'
78+
publicPath: 'https://unpkg.com/@robostack/jupyter-ros@' + version + '/dist/'
7779
},
7880
devtool: 'source-map',
7981
module: {

0 commit comments

Comments
 (0)