Skip to content

Commit acd2576

Browse files
authored
Merge branch 'main' into duplicating-widget
2 parents 705a8a9 + e1718c2 commit acd2576

File tree

94 files changed

+20745
-14542
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+20745
-14542
lines changed

.binder/postBuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
set -e
44

55
npm install -g yarn
6+
yarn set version stable
67

78
./dev-install.sh

.binder/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
bqplot
22
ipyleaflet
33
jupyterlab-myst
4-
jupyterlab~=3.0
4+
jupyterlab==4.0.2
55
matplotlib
66
networkx
77
numpy

.github/workflows/build.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@ jobs:
1313
- name: Checkout
1414
uses: actions/checkout@v3
1515

16-
- name: Install node
17-
uses: actions/setup-node@v3
18-
with:
19-
node-version: '18'
20-
cache: yarn
21-
2216
- name: Install Python
2317
uses: actions/setup-python@v4
2418
with:
@@ -36,7 +30,7 @@ jobs:
3630
3731
- name: Install build dependencies
3832
run: |
39-
python -m pip install jupyterlab~=3.0 jupyter_packaging~=0.10
33+
python -m pip install jupyterlab jupyter_packaging~=0.10
4034
4135
- name: Install node dependencies
4236
run: |

.github/workflows/devinstall.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ jobs:
1212
steps:
1313
- name: Checkout
1414
uses: actions/checkout@v3
15-
- name: Install node
16-
uses: actions/setup-node@v3
17-
with:
18-
node-version: '18'
19-
cache: yarn
2015
- name: Install Python
2116
uses: actions/setup-python@v4
2217
with:
@@ -33,7 +28,7 @@ jobs:
3328
3429
- name: Install dependencies
3530
run: |
36-
python -m pip install notebook jupyterlab~=3.0 jupyter_packaging~=0.10
31+
python -m pip install notebook jupyterlab notebook~=6.0 jupyter_packaging~=0.10
3732
- name: Run the dev-install script
3833
run: |
3934
./dev-install.sh

.github/workflows/lint.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,19 @@ jobs:
99

1010
steps:
1111
- uses: actions/checkout@v3
12-
- name: Install node
13-
uses: actions/setup-node@v3
12+
13+
- name: Install Python
14+
uses: actions/setup-python@v4
1415
with:
15-
node-version: '18'
16-
cache: yarn
16+
python-version: '3.8'
17+
architecture: 'x64'
18+
19+
- name: Install dependencies
20+
run: |
21+
python -m pip install jupyterlab
22+
1723
- name: yarn install, integrity, lint
1824
run: |
19-
yarn --frozen-lockfile
20-
yarn integrity
21-
yarn lint:check
25+
jlpm --immutable
26+
jlpm integrity
27+
jlpm lint:check

.github/workflows/packaging.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ jobs:
2121
- name: Checkout
2222
uses: actions/checkout@v3
2323

24-
- name: Install node
25-
uses: actions/setup-node@v3
26-
with:
27-
node-version: '18'
28-
cache: yarn
29-
3024
- name: Install Python
3125
uses: actions/setup-python@v4
3226
with:
@@ -42,7 +36,7 @@ jobs:
4236
4337
- name: Install dependencies
4438
run: |
45-
python -m pip install --upgrade pip wheel build jupyterlab~=3.0
39+
python -m pip install --upgrade pip wheel build jupyterlab
4640
4741
- name: Build PyPI distributions for ipywidgets
4842
run: |
@@ -53,11 +47,11 @@ jobs:
5347
5448
- name: Install node dependencies
5549
run: |
56-
yarn
50+
jlpm
5751
5852
- name: Build JS
5953
run: |
60-
yarn build
54+
jlpm build
6155
6256
- name: Build PyPI distributions for jupyterlab_widgets
6357
run: |

.github/workflows/tests.yml

Lines changed: 28 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,11 @@ jobs:
1111
- name: Set up Python
1212
uses: actions/setup-python@v4
1313
with:
14-
python-version: 3.7
14+
python-version: 3.8
1515
cache: 'pip'
1616
cache-dependency-path: |
1717
**/setup.cfg
1818
**/requirements*.txt
19-
- name: Install node
20-
uses: actions/setup-node@v3
21-
with:
22-
node-version: '18'
23-
cache: yarn
2419
- name: Install dependencies
2520
run: |
2621
sudo apt-get install -y pandoc
@@ -39,44 +34,39 @@ jobs:
3934
- name: Set up Python
4035
uses: actions/setup-python@v4
4136
with:
42-
python-version: 3.7
37+
python-version: 3.8
4338
cache: 'pip'
4439
cache-dependency-path: |
4540
**/setup.cfg
4641
**/requirements*.txt
4742
- name: Install dependencies
4843
run: |
4944
python -m pip install --upgrade pip
50-
python -m pip install jupyterlab~=3.0
51-
- name: Install node
52-
uses: actions/setup-node@v3
53-
with:
54-
node-version: '18'
55-
cache: yarn
45+
python -m pip install jupyterlab==4.0.0
5646
- name: yarn install, build, test
5747
run: |
58-
yarn --frozen-lockfile
59-
yarn build
60-
yarn build:examples
48+
jlpm --immutable
49+
jlpm build
50+
jlpm build:examples
6151
6252
pushd packages/base
63-
yarn test:unit:firefox:headless
53+
jlpm test:unit:firefox:headless
6454
popd
6555
6656
pushd packages/base-manager
67-
yarn test:unit:firefox:headless
57+
jlpm test:unit:firefox:headless
6858
popd
6959
7060
pushd packages/controls
71-
yarn test:unit:firefox:headless
61+
jlpm test:unit:firefox:headless
7262
popd
7363
7464
pushd packages/html-manager
75-
yarn test:unit:firefox:headless
65+
jlpm test:unit:firefox:headless
7666
popd
7767
7868
pushd examples/web1
79-
yarn test:firefox:headless
69+
jlpm test:firefox:headless
8070
popd
8171
8272
env:
@@ -87,7 +77,7 @@ jobs:
8777
strategy:
8878
max-parallel: 4
8979
matrix:
90-
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
80+
python-version: ['3.8', '3.9', '3.10', '3.11']
9181

9282
steps:
9383
- uses: actions/checkout@v3
@@ -118,27 +108,22 @@ jobs:
118108
- name: Set up Python
119109
uses: actions/setup-python@v4
120110
with:
121-
python-version: 3.7
111+
python-version: 3.8
122112
cache: 'pip'
123113
cache-dependency-path: |
124114
**/setup.cfg
125115
**/requirements*.txt
126-
- name: Install node
127-
uses: actions/setup-node@v3
128-
with:
129-
node-version: '18'
130-
cache: yarn
131116
- name: Install Python dependencies
132117
run: |
133118
python -m pip install --upgrade pip
134-
pip install file://$PWD/python/ipywidgets#egg=ipywidgets[test]
119+
pip install jupyterlab file://$PWD/python/ipywidgets#egg=ipywidgets[test]
135120
- name: Install JS dependencies
136121
run: |
137-
yarn
122+
jlpm
138123
- name: Compare spec with latest version
139124
run: |
140125
python ./packages/schema/generate-spec.py -f markdown spec.md
141-
yarn prettier
126+
jlpm prettier
142127
diff -u ./packages/schema/jupyterwidgetmodels.latest.md ./spec.md
143128
144129
ui-test:
@@ -159,18 +144,12 @@ jobs:
159144
- name: Install dependencies
160145
run: |
161146
python -m pip install --upgrade pip
162-
python -m pip install -U jupyterlab~=3.2 jupyter-packaging~=0.10
163-
164-
- name: Install node
165-
uses: actions/setup-node@v3
166-
with:
167-
node-version: '18'
168-
cache: yarn
147+
python -m pip install -U jupyterlab==4.0.0 jupyter-packaging~=0.10
169148
170149
- name: Build and Install ipywidgets
171150
run: |
172-
yarn --frozen-lockfile
173-
yarn build
151+
jlpm --immutable
152+
jlpm build
174153
175154
- name: Build the extension
176155
run: |
@@ -187,25 +166,15 @@ jobs:
187166
188167
- name: Install Test Dependencies
189168
run: |
190-
cd ui-tests
191-
yarn --frozen-lockfile
192-
yarn playwright install chromium
193-
194-
- name: Launch JupyterLab
195-
run: |
196-
cd ui-tests
197-
yarn start:detached
198-
199-
- name: Wait for JupyterLab
200-
uses: ifaxity/wait-on-action@v1
201-
with:
202-
resource: http-get://localhost:8888/api
203-
timeout: 20000
169+
jlpm --immutable
170+
npx playwright install chromium
171+
working-directory: ui-tests
204172

205-
- name: Run UI Tests
173+
- name: Execute integration tests
174+
shell: bash -l {0}
175+
working-directory: ui-tests
206176
run: |
207-
cd ui-tests
208-
yarn test
177+
npx playwright test
209178
210179
- name: Upload Playwright Test assets
211180
if: always()
@@ -225,9 +194,9 @@ jobs:
225194
226195
- name: Update snapshots
227196
if: failure()
197+
working-directory: ui-tests
228198
run: |
229-
cd ui-tests
230-
yarn test:update
199+
jlpm test:update
231200
232201
- name: Upload updated snapshots
233202
if: failure()

.yarnrc

Lines changed: 0 additions & 4 deletions
This file was deleted.

.yarnrc.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
nodeLinker: node-modules
2+
3+
# prettier-ignore
4+
packageExtensions:
5+
"@nrwl/devkit@^15":
6+
dependencies:
7+
nx: ^15
8+
postcss-cssnext@^3.1.0:
9+
dependencies:
10+
caniuse-lite: ^1
11+
source-map-loader@^4:
12+
dependencies:
13+
webpack: ^5

CONTRIBUTING.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ python -c "import IPython; print(IPython.sys_info())"
1616
- **All work is submitted through pull requests (PRs)**
1717
- PRs are submitted as soon as there is code to be discussed
1818

19-
Current developer information can be found in the latest docs [here](https://ipywidgets.readthedocs.io/en/latest/developer_docs.html).
20-
2119
---
2220

2321
# Check these resources:

0 commit comments

Comments
 (0)