Skip to content

Commit 83fe0f2

Browse files
DenisaCGDenisaCG
committed
updated to v0.2.0 of jupyterlab-blockly and removed sharedPackages configuration
1 parent 480fb92 commit 83fe0f2

File tree

5 files changed

+54
-63
lines changed

5 files changed

+54
-63
lines changed

‎package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"dependencies": {
5757
"@jupyterlab/application": "^3.4",
5858
"blockly": "^7.20211209.2",
59-
"jupyterlab-blockly": "^0.1.1",
59+
"jupyterlab-blockly": "^0.2.0",
6060
"patch-package": "^6.4.7",
6161
"postinstall-postinstall": "^2.1.0"
6262
},
@@ -87,17 +87,7 @@
8787
},
8888
"jupyterlab": {
8989
"extension": true,
90-
"outputDir": "jupyterlab_lego_boost/labextension",
91-
"sharedPackages": {
92-
"jupyterlab-blockly": {
93-
"bundled": false,
94-
"singleton": true
95-
},
96-
"blockly": {
97-
"bundled": false,
98-
"singleton": true
99-
}
100-
}
90+
"outputDir": "jupyterlab_lego_boost/labextension"
10191
},
10292
"jupyter-releaser": {
10393
"hooks": {

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
zip_safe=False,
5555
include_package_data=True,
5656
python_requires=">=3.7",
57-
install_requires=['jupyterlab-blockly>=0.1.1,<0.2'],
57+
install_requires=['jupyterlab-blockly>=0.2.0,<0.3'],
5858
extras_require={
5959
'env': ['bleak', 'pylgbst']
6060
},

‎src/lego_boost_python_generators_and_blocks.js

Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,11 @@ Blockly.Blocks['lego_boost_sleep'] = {
198198
* Generators
199199
*/
200200

201-
Blockly.Python['lego_boost_connect'] = function (block) {
202-
var value_bluetooth_address = Blockly.Python.valueToCode(
201+
BlocklyPy['lego_boost_connect'] = function (block) {
202+
var value_bluetooth_address = BlocklyPy.valueToCode(
203203
block,
204204
'BLUETOOTH_ADDRESS',
205-
Blockly.Python.ORDER_ATOMIC
205+
BlocklyPy.ORDER_ATOMIC
206206
);
207207

208208
var code =
@@ -217,17 +217,17 @@ from pylgbst.hub import MoveHub
217217
from pylgbst import get_connection_bleak
218218
`;
219219

220-
Blockly.Python['lego_boost_move_motor_a_timed'] = function (block) {
221-
var value_time = Blockly.Python.valueToCode(
220+
BlocklyPy['lego_boost_move_motor_a_timed'] = function (block) {
221+
var value_time = BlocklyPy.valueToCode(
222222
block,
223223
'TIME',
224-
Blockly.Python.ORDER_ATOMIC
224+
BlocklyPy.ORDER_ATOMIC
225225
);
226226

227-
var value_speed = Blockly.Python.valueToCode(
227+
var value_speed = BlocklyPy.valueToCode(
228228
block,
229229
'SPEED',
230-
Blockly.Python.ORDER_ATOMIC
230+
BlocklyPy.ORDER_ATOMIC
231231
);
232232

233233
var code = 'hub.motor_A.timed(' + value_time + ', ' + value_speed + ')\n';
@@ -238,17 +238,17 @@ Blockly.Blocks['lego_boost_move_motor_a_timed'].toplevel_init = `
238238
import time
239239
`;
240240

241-
Blockly.Python['lego_boost_move_motor_b_timed'] = function (block) {
242-
var value_time = Blockly.Python.valueToCode(
241+
BlocklyPy['lego_boost_move_motor_b_timed'] = function (block) {
242+
var value_time = BlocklyPy.valueToCode(
243243
block,
244244
'TIME',
245-
Blockly.Python.ORDER_ATOMIC
245+
BlocklyPy.ORDER_ATOMIC
246246
);
247247

248-
var value_speed = Blockly.Python.valueToCode(
248+
var value_speed = BlocklyPy.valueToCode(
249249
block,
250250
'SPEED',
251-
Blockly.Python.ORDER_ATOMIC
251+
BlocklyPy.ORDER_ATOMIC
252252
);
253253

254254
var code = 'hub.motor_B.timed(' + value_time + ', ' + value_speed + ')\n';
@@ -259,57 +259,57 @@ Blockly.Blocks['lego_boost_move_motor_b_timed'].toplevel_init = `
259259
import time
260260
`;
261261

262-
Blockly.Python['lego_boost_move_motor_a_angled'] = function (block) {
263-
var value_angle = Blockly.Python.valueToCode(
262+
BlocklyPy['lego_boost_move_motor_a_angled'] = function (block) {
263+
var value_angle = BlocklyPy.valueToCode(
264264
block,
265265
'ANGLE',
266-
Blockly.Python.ORDER_ATOMIC
266+
BlocklyPy.ORDER_ATOMIC
267267
);
268268

269-
var value_speed = Blockly.Python.valueToCode(
269+
var value_speed = BlocklyPy.valueToCode(
270270
block,
271271
'SPEED',
272-
Blockly.Python.ORDER_ATOMIC
272+
BlocklyPy.ORDER_ATOMIC
273273
);
274274

275275
var code = 'hub.motor_A.angled(' + value_angle + ', ' + value_speed + ')\n';
276276
return code;
277277
};
278278

279-
Blockly.Python['lego_boost_move_motor_b_angled'] = function (block) {
280-
var value_angle = Blockly.Python.valueToCode(
279+
BlocklyPy['lego_boost_move_motor_b_angled'] = function (block) {
280+
var value_angle = BlocklyPy.valueToCode(
281281
block,
282282
'ANGLE',
283-
Blockly.Python.ORDER_ATOMIC
283+
BlocklyPy.ORDER_ATOMIC
284284
);
285285

286-
var value_speed = Blockly.Python.valueToCode(
286+
var value_speed = BlocklyPy.valueToCode(
287287
block,
288288
'SPEED',
289-
Blockly.Python.ORDER_ATOMIC
289+
BlocklyPy.ORDER_ATOMIC
290290
);
291291

292292
var code = 'hub.motor_B.angled(' + value_angle + ', ' + value_speed + ')\n';
293293
return code;
294294
};
295295

296-
Blockly.Python['lego_boost_move_motor_ab_timed'] = function (block) {
297-
var value_time = Blockly.Python.valueToCode(
296+
BlocklyPy['lego_boost_move_motor_ab_timed'] = function (block) {
297+
var value_time = BlocklyPy.valueToCode(
298298
block,
299299
'TIME',
300-
Blockly.Python.ORDER_ATOMIC
300+
BlocklyPy.ORDER_ATOMIC
301301
);
302302

303-
var value_speed_a = Blockly.Python.valueToCode(
303+
var value_speed_a = BlocklyPy.valueToCode(
304304
block,
305305
'SPEED_A',
306-
Blockly.Python.ORDER_ATOMIC
306+
BlocklyPy.ORDER_ATOMIC
307307
);
308308

309-
var value_speed_b = Blockly.Python.valueToCode(
309+
var value_speed_b = BlocklyPy.valueToCode(
310310
block,
311311
'SPEED_B',
312-
Blockly.Python.ORDER_ATOMIC
312+
BlocklyPy.ORDER_ATOMIC
313313
);
314314

315315
var code =
@@ -327,23 +327,23 @@ Blockly.Blocks['lego_boost_move_motor_ab_timed'].toplevel_init = `
327327
import time
328328
`;
329329

330-
Blockly.Python['lego_boost_move_motor_ab_angled'] = function (block) {
331-
var value_angle = Blockly.Python.valueToCode(
330+
BlocklyPy['lego_boost_move_motor_ab_angled'] = function (block) {
331+
var value_angle = BlocklyPy.valueToCode(
332332
block,
333333
'ANGLE',
334-
Blockly.Python.ORDER_ATOMIC
334+
BlocklyPy.ORDER_ATOMIC
335335
);
336336

337-
var value_speed_a = Blockly.Python.valueToCode(
337+
var value_speed_a = BlocklyPy.valueToCode(
338338
block,
339339
'SPEED_A',
340-
Blockly.Python.ORDER_ATOMIC
340+
BlocklyPy.ORDER_ATOMIC
341341
);
342342

343-
var value_speed_b = Blockly.Python.valueToCode(
343+
var value_speed_b = BlocklyPy.valueToCode(
344344
block,
345345
'SPEED_B',
346-
Blockly.Python.ORDER_ATOMIC
346+
BlocklyPy.ORDER_ATOMIC
347347
);
348348

349349
var code =
@@ -356,35 +356,36 @@ Blockly.Python['lego_boost_move_motor_ab_angled'] = function (block) {
356356
return code;
357357
};
358358

359-
Blockly.Python['lego_boost_start_speed'] = function (block) {
360-
var value_speed = Blockly.Python.valueToCode(
359+
BlocklyPy['lego_boost_start_speed'] = function (block) {
360+
var value_speed = BlocklyPy.valueToCode(
361361
block,
362362
'SPEED',
363-
Blockly.Python.ORDER_ATOMIC
363+
BlocklyPy.ORDER_ATOMIC
364364
);
365365

366366
var code = 'hub.motor_external.start_speed(' + value_speed + ')\n';
367367
return code;
368368
};
369369

370-
Blockly.Python['lego_boost_stop_motors'] = function (block) {
370+
BlocklyPy['lego_boost_stop_motors'] = function (block) {
371371
var code = 'hub.motor_external.stop()\n';
372372
return code;
373373
};
374374

375-
Blockly.Python['lego_boost_disconnect'] = function (block) {
375+
BlocklyPy['lego_boost_disconnect'] = function (block) {
376376
var code = 'hub.disconnect()\n';
377377
return code;
378378
};
379379

380-
Blockly.Python['lego_boost_sleep'] = function (block) {
381-
var value_seconds = Blockly.Python.valueToCode(
380+
BlocklyPy['lego_boost_sleep'] = function (block) {
381+
var value_seconds = BlocklyPy.valueToCode(
382382
block,
383383
'SECONDS',
384-
Blockly.Python.ORDER_ATOMIC
384+
BlocklyPy.ORDER_ATOMIC
385385
);
386386

387387
var code = 'time.sleep(' + value_seconds + ')\n';
388+
return code;
388389
};
389390

390391
Blockly.Blocks['lego_boost_sleep'].toplevel_init = `

‎yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3827,10 +3827,10 @@ jsprim@^1.2.2:
38273827
json-schema "0.4.0"
38283828
verror "1.10.0"
38293829

3830-
jupyterlab-blockly@^0.1.1:
3831-
version "0.1.1"
3832-
resolved "https://registry.yarnpkg.com/jupyterlab-blockly/-/jupyterlab-blockly-0.1.1.tgz#829738ed96f0da0032ea3733b48ce8deb2046a08"
3833-
integrity sha512-zU73Omvg86QzjtXlLZncR+W4sHfmDmL2pId8qeCZfkDczfIX6tlduJcw7eKyqa7eHWHox77VL8B5IrF99Uzp4w==
3830+
jupyterlab-blockly@^0.2.0:
3831+
version "0.2.0"
3832+
resolved "https://registry.yarnpkg.com/jupyterlab-blockly/-/jupyterlab-blockly-0.2.0.tgz#fc1467b832d7e981c1066890711063fc7adfa598"
3833+
integrity sha512-81btcNmyqzusDLWtAsiPKfQ+xmHQG4GX69r4M5N+nDe+12GJ1q7TKiLkqU5X5oC1/QwwUhewCfivOWoJMAtoZg==
38343834
dependencies:
38353835
"@jupyterlab/apputils" "^3.4"
38363836
"@jupyterlab/cells" "^3.4"

0 commit comments

Comments
 (0)