Skip to content

Commit 3f0746c

Browse files
authored
Merge pull request #125 from sspickle/webpack-fix-2020-08-15
Webpack fix 2020 08 15
2 parents 3f51605 + eaede6c commit 3f0746c

File tree

7 files changed

+103
-113
lines changed

7 files changed

+103
-113
lines changed

labextension/vpython/README.md

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,42 @@ Except where the tutorial says: `conda install -c conda-forge jupyterlab=2`, use
2424
and tailor the instructions for creating a vpython labextension. Also, the tutorial command
2525
`jupyter lab --watch` will fail. Just use `jupyter lab`.
2626

27+
The original instructions below caused trouble for me (steve, I got various React errors) but this is what worked:
28+
29+
1) Create and activate a conda environment, and then install jupyterlab:
30+
31+
conda create -n jupyterlab-ext --override-channels --strict-channel-priority -c conda-forge -c anaconda jupyterlab cookiecutter nodejs git
32+
33+
conda activate jupyterlab-ext
34+
35+
conda install -c conda-forge jupyterlab=1
36+
37+
2) git clone the repository (the branch from the pull request) somewhere using whatever git machinery you prefer.
38+
39+
Then “cd” into the ‘vpython-jupyter/labextension/vpython’ of that repository.
40+
41+
3) In the ‘vpython-jupyter/labextension/vpython’ directory of that repository execute:
42+
43+
cp -r ../../vpython/vpython_{libraries,data} .
44+
45+
yarn install
46+
47+
jupyter labextension install .
48+
49+
4) Install vpyton in this virtual environment:
50+
51+
cd ../..
52+
53+
pip install -e .
54+
55+
And then to run a lab notebook:
56+
57+
jupyter lab
58+
59+
Then you should be able to import vpython now and run notebooks in jupyterlab.
60+
61+
Original instructions:
62+
2763
```bash
2864
jlpm install
2965
jlpm add @jupyterlab/application
@@ -45,5 +81,3 @@ To rebuild the package and the JupyterLab app:
4581
jlpm run build
4682
jupyter lab build
4783
```
48-
49-

labextension/vpython/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

labextension/vpython/src/glowcommlab.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ var attrsb = {'a':'userzoom', 'b':'userspin', 'c':'range', 'd':'autoscale', 'e':
472472
'p':'left', 'q':'right', 'r':'top', 's':'bottom', 't':'_cloneid',
473473
'u':'logx', 'v':'logy', 'w':'dot', 'x':'dot_radius',
474474
'y':'markers', 'z':'legend', 'A':'label','B':'delta', 'C':'marker_color',
475-
'D':'size_units', 'E':'userpan', 'F':'scroll', 'G':'choices', 'H':'depth'}
475+
'D':'size_units', 'E':'userpan', 'F':'scroll', 'G':'choices', 'H':'depth', 'I':'round'}
476476

477477
// methods are X in {'m': '23X....'}
478478
var methods = {'a':'select', 'b':'pos', 'c':'start', 'd':'stop', 'f':'clear', // unused eghijklmnopvxyzCDFAB

0 commit comments

Comments
 (0)