Skip to content

Commit 25b2fc3

Browse files
committed
Switch to using jlpm everywhere
1 parent eae29e3 commit 25b2fc3

File tree

17 files changed

+69
-72
lines changed

17 files changed

+69
-72
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ jobs:
3030
restore-keys: |
3131
${{ runner.os }}-pip-${{ matrix.python }}
3232
33-
- name: Update yarn
34-
run: npm install --global yarn@^3
35-
3633
- name: Get yarn cache directory path
3734
id: yarn-cache-dir-path
3835
run: echo "::set-output name=dir::$(yarn cache dir)"
@@ -50,9 +47,9 @@ jobs:
5047
python -m pip install jupyter_packaging~=0.7.9
5148
- name: Build the extension
5249
run: |
53-
yarn install --frozen-lockfile
54-
yarn run build
55-
yarn run build:examples
50+
jlpm install --frozen-lockfile
51+
jlpm run build
52+
jlpm run build:examples
5653
5754
# First install the dev jupyterlab_widgets, since it is a dependency
5855
pushd jupyterlab_widgets
@@ -70,17 +67,17 @@ jobs:
7067
- name: Run JS tests
7168
run: |
7269
pushd packages/base
73-
yarn run test:unit:firefox:headless
70+
jlpm run test:unit:firefox:headless
7471
popd
7572
7673
pushd packages/controls
77-
yarn run test:unit:firefox:headless
74+
jlpm run test:unit:firefox:headless
7875
popd
7976
8077
pushd packages/html-manager
81-
yarn run test:unit:firefox:headless
78+
jlpm run test:unit:firefox:headless
8279
popd
8380
8481
pushd examples/web1
85-
yarn run test:firefox:headless
82+
jlpm run test:firefox:headless
8683
popd

dev-install.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ $? -ne 0 ]; then
2020
exit 1
2121
fi
2222

23-
echo -n "Checking JupyterLab (assuming JupyterLab >=3)... "
23+
echo -n "Checking JupyterLab (assuming JupyterLab >=4)... "
2424
jupyter lab --version 2>/dev/null
2525
if [ $? -ne 0 ]; then
2626
echo "no, skipping installation of widgets for jupyterlab"
@@ -34,8 +34,8 @@ set -e
3434
nbExtFlags="--sys-prefix $1"
3535

3636
echo -n "Installing and building all yarn packages"
37-
yarn install
38-
yarn run build
37+
jlpm install
38+
jlpm run build
3939

4040
echo -n "widgetsnbextension"
4141
cd widgetsnbextension

docs/source/dev_install.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ To install ipywidgets from git, you will need:
1717
version of the notebook, checkout the appropriate tag.
1818
+ See the
1919
[Compatibility table](https://github.com/jupyter-widgets/ipywidgets#compatibility)
20-
20+
2121
- the latest [JupyterLab release](https://github.com/jupyterlab/jupyterlab/releases)
2222

2323

2424

25-
### Installing With Conda
25+
### Installing With Conda
2626

2727
```bash
2828
conda create -c conda-forge -n ipywidgets yarn notebook
@@ -41,10 +41,10 @@ Rebuilding after making changes
4141

4242
To build and test changes, run the following commands in the ipywidgets repository root directory, empty your browser's cache, and refresh the page.
4343

44-
yarn run clean
45-
yarn run build
44+
jlpm run clean
45+
jlpm run build
4646

47-
If your changes are confined to one package (for example, just in the widgetsnbextension package), then it may be sufficient to just run `yarn run build` in that specific directory.
47+
If your changes are confined to one package (for example, just in the widgetsnbextension package), then it may be sufficient to just run `jlpm run build` in that specific directory.
4848

4949
Tips and troubleshooting
5050
------------------------

docs/source/dev_release.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ git checkout 7.x
4747
git pull origin 7.x
4848
git reset --hard origin/7.x
4949
git clean -fdx
50-
yarn install
51-
yarn run publish
50+
jlpm install
51+
npm publish
5252
```
5353

5454
Lerna will prompt you for version numbers for each of the changed npm packages. Lerna will then change the versions appropriately (including the interdependency versions), commit, tag, and publish the new packages to npm.

docs/source/dev_testing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ To run the Python tests:
77

88
To run the Javascript tests in each package directory:
99

10-
yarn test
10+
jlpm test
1111

1212
This will run the test suite using `karma` with 'debug' level logging.

examples/web1/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
"scripts": {
1010
"build": "webpack",
1111
"clean": "rimraf built",
12-
"test": "npm run test:firefox && npm run test:chrome",
13-
"test:chrome": "npm run test:default",
12+
"test": "jlpm run test:firefox && jlpm run test:chrome",
13+
"test:chrome": "jlpm run test:default",
1414
"test:default": "karma start karma.config.js --log-level debug",
15-
"test:firefox": "npm run test:default -- --browsers Firefox",
16-
"test:firefox:headless": "npm run test:default -- --browsers FirefoxHeadless"
15+
"test:firefox": "jlpm run test:default -- --browsers Firefox",
16+
"test:firefox:headless": "jlpm run test:default -- --browsers FirefoxHeadless"
1717
},
1818
"dependencies": {
1919
"@jupyter-widgets/base": "^4.1.6",

examples/web2/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"scripts": {
1010
"build": "webpack",
1111
"clean": "rimraf built",
12-
"test": "npm run test:default",
12+
"test": "jlpm run test:default",
1313
"test:default": "echo \"No test specified\""
1414
},
1515
"dependencies": {

examples/web3/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"author": "IPython",
88
"main": "lib/index.js",
99
"scripts": {
10-
"build": "npm run clean && tsc && node scripts/copyfiles.js && webpack",
10+
"build": "jlpm run clean && tsc && node scripts/copyfiles.js && webpack",
1111
"clean": "rimraf lib && rimraf tsconfig.tsbuildinfo && rimraf built",
1212
"host": "http-server",
1313
"lint": "tslint --project tslint.json --format stylish",
14-
"test": "npm run test:default",
14+
"test": "jlpm run test:default",
1515
"test:default": "echo \"No test specified\""
1616
},
1717
"dependencies": {

examples/web4/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"scripts": {
1010
"build": "webpack",
1111
"clean": "rimraf built",
12-
"test": "npm run test:default",
12+
"test": "jlpm run test:default",
1313
"test:default": "echo \"No test specified\""
1414
},
1515
"dependencies": {

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"lerna": "3.2.1",
3-
"npmClient": "yarn",
3+
"npmClient": "jlpm",
44
"useWorkspaces": true,
55
"version": "independent"
66
}

0 commit comments

Comments
 (0)