Skip to content

Commit 6eb7e62

Browse files
martinRenoumartinRenou
committed
Update CI
Signed-off-by: martinRenou <[email protected]>
1 parent e9f5a28 commit 6eb7e62

File tree

6 files changed

+120
-88
lines changed

6 files changed

+120
-88
lines changed

‎.github/workflows/check.yml‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,27 @@ jobs:
103103
user: __token__
104104
password: ${{ secrets.pypi_password }}
105105

106+
build:
107+
runs-on: ubuntu-latest
108+
steps:
109+
- name: setup python to build package
110+
uses: actions/setup-python@v4
111+
with:
112+
python-version: '3.10'
113+
- name: install build
114+
run: python -m pip install build
115+
- uses: actions/checkout@v3
116+
- name: build package
117+
run: python -m build --sdist --wheel . -o dist
118+
- name: Upload builds
119+
uses: actions/upload-artifact@v3
120+
with:
121+
name: dist ${{ github.run_number }}
122+
path: ./dist
123+
106124
visual-regression-tests-ipw7:
107125
runs-on: ubuntu-latest
126+
needs: [build]
108127

109128
steps:
110129
- name: Checkout
@@ -119,8 +138,14 @@ jobs:
119138
auto-activate-base: false
120139
channels: conda-forge
121140

141+
- uses: actions/download-artifact@v3
142+
with:
143+
name: dist ${{ github.run_number }}
144+
path: ./dist
145+
122146
- name: Install the package
123-
run: pip install -vv .
147+
run: pip install -vv ipydatagrid*.whl
148+
working-directory: dist
124149

125150
- name: Install dependencies
126151
shell: bash -l {0}
@@ -150,6 +175,7 @@ jobs:
150175
151176
visual-regression-tests-ipw8:
152177
runs-on: ubuntu-latest
178+
needs: [build]
153179

154180
steps:
155181
- name: Checkout
@@ -164,8 +190,14 @@ jobs:
164190
auto-activate-base: false
165191
channels: conda-forge
166192

193+
- uses: actions/download-artifact@v3
194+
with:
195+
name: dist ${{ github.run_number }}
196+
path: ./dist
197+
167198
- name: Install the package
168-
run: pip install -vv .
199+
run: pip install -vv ipydatagrid*.whl
200+
working-directory: dist
169201

170202
- name: Install dependencies
171203
shell: bash -l {0}

‎package.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,19 @@
5454
"watch:labextension": "jupyter labextension watch ."
5555
},
5656
"dependencies": {
57-
"@jupyter-widgets/base": "^2 || ^3 || ^4 || ^6.0.0",
58-
"@jupyterlab/apputils": "^4.1.5",
59-
"@lumino/algorithm": "^2.0.1",
60-
"@lumino/application": "^2.2.1",
61-
"@lumino/commands": "^2.1.3",
62-
"@lumino/coreutils": "^2.1.2",
63-
"@lumino/datagrid": "^2.2.0",
64-
"@lumino/default-theme": "^2.1.3",
65-
"@lumino/domutils": "^2.0.1",
66-
"@lumino/messaging": "^2.0.1",
67-
"@lumino/signaling": "^2.1.2",
68-
"@lumino/virtualdom": "^2.0.1",
69-
"@lumino/widgets": "^2.3.0",
57+
"@jupyter-widgets/base": "^2 || ^3 || ^4 || ^6",
58+
"@jupyterlab/apputils": "^3 || ^4",
59+
"@lumino/algorithm": "^1 || ^2",
60+
"@lumino/application": "^1 || ^2",
61+
"@lumino/commands": "^1 || ^2",
62+
"@lumino/coreutils": "^1 || ^2",
63+
"@lumino/datagrid": "^1 || ^2",
64+
"@lumino/default-theme": "^1 || ^2",
65+
"@lumino/domutils": "^1 || ^2",
66+
"@lumino/messaging": "^1 || ^2",
67+
"@lumino/signaling": "^1 || ^2",
68+
"@lumino/virtualdom": "^1 || ^2",
69+
"@lumino/widgets": "^1 || ^2",
7070
"bqplot": "^0.5",
7171
"core-js-pure": "^3.30.2",
7272
"d3-array": "^2.2.0",

‎test-environment-ipyw7.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies:
1313
- pandas >=1.0.0,<2.0.0
1414
- bqplot
1515
- scipy
16-
- jupyterlab
16+
- jupyterlab =3
1717
- jupyter-packaging
1818
- pytest
1919
- nbval

‎test-environment-ipyw8.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies:
1313
- pandas >=1.0.0,<2.0.0
1414
- bqplot
1515
- scipy
16-
- jupyterlab
16+
- jupyterlab =4
1717
- jupyter-packaging
1818
- pytest
1919
- nbval

‎tsconfig.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"compilerOptions": {
33
"declaration": true,
44
"esModuleInterop": true,
5-
"module": "ES2015",
5+
"module": "CommonJS",
66
"moduleResolution": "node",
77
"noEmitOnError": true,
88
"noUnusedLocals": true,
@@ -14,7 +14,7 @@
1414
"strict": true,
1515
// This allows us to initialize members in the "initialize" method
1616
"strictPropertyInitialization": false,
17-
"target": "ES2017"
17+
"target": "es2017"
1818
},
1919
"include": ["js/*.ts", "js/*.tsx", "js/core/*.ts", "js/core/*.tsx"]
2020
}

‎yarn.lock‎

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1778,7 +1778,7 @@ __metadata:
17781778
languageName: node
17791779
linkType: hard
17801780

1781-
"@jupyter-widgets/base@npm:^2 || ^3 || ^4 || ^5 || ^6, @jupyter-widgets/base@npm:^2 || ^3 || ^4 || ^6.0.0":
1781+
"@jupyter-widgets/base@npm:^2 || ^3 || ^4 || ^5 || ^6, @jupyter-widgets/base@npm:^2 || ^3 || ^4 || ^6":
17821782
version: 6.0.5
17831783
resolution: "@jupyter-widgets/base@npm:6.0.5"
17841784
dependencies:
@@ -1809,7 +1809,7 @@ __metadata:
18091809
languageName: node
18101810
linkType: hard
18111811

1812-
"@jupyterlab/apputils@npm:^4.1.5":
1812+
"@jupyterlab/apputils@npm:^3 || ^4":
18131813
version: 4.1.5
18141814
resolution: "@jupyterlab/apputils@npm:4.1.5"
18151815
dependencies:
@@ -2034,21 +2034,21 @@ __metadata:
20342034
languageName: node
20352035
linkType: hard
20362036

2037+
"@lumino/algorithm@npm:^1 || ^2, @lumino/algorithm@npm:^2.0.1":
2038+
version: 2.0.1
2039+
resolution: "@lumino/algorithm@npm:2.0.1"
2040+
checksum: cbf7fcf6ee6b785ea502cdfddc53d61f9d353dcb9659343511d5cd4b4030be2ff2ca4c08daec42f84417ab0318a3d9972a17319fa5231693e109ab112dcf8000
2041+
languageName: node
2042+
linkType: hard
2043+
20372044
"@lumino/algorithm@npm:^1.9.2":
20382045
version: 1.9.2
20392046
resolution: "@lumino/algorithm@npm:1.9.2"
20402047
checksum: a89e7c63504236119634858e271db1cc649684d30ced5a6ebe2788af7c0837f1e05a6fd3047d8525eb756c42ce137f76b3688f75fd3ef915b71cd4f213dfbb96
20412048
languageName: node
20422049
linkType: hard
20432050

2044-
"@lumino/algorithm@npm:^2.0.1":
2045-
version: 2.0.1
2046-
resolution: "@lumino/algorithm@npm:2.0.1"
2047-
checksum: cbf7fcf6ee6b785ea502cdfddc53d61f9d353dcb9659343511d5cd4b4030be2ff2ca4c08daec42f84417ab0318a3d9972a17319fa5231693e109ab112dcf8000
2048-
languageName: node
2049-
linkType: hard
2050-
2051-
"@lumino/application@npm:^2.2.1":
2051+
"@lumino/application@npm:^1 || ^2, @lumino/application@npm:^2.2.1":
20522052
version: 2.2.1
20532053
resolution: "@lumino/application@npm:2.2.1"
20542054
dependencies:
@@ -2077,6 +2077,21 @@ __metadata:
20772077
languageName: node
20782078
linkType: hard
20792079

2080+
"@lumino/commands@npm:^1 || ^2, @lumino/commands@npm:^2.1.3":
2081+
version: 2.1.3
2082+
resolution: "@lumino/commands@npm:2.1.3"
2083+
dependencies:
2084+
"@lumino/algorithm": ^2.0.1
2085+
"@lumino/coreutils": ^2.1.2
2086+
"@lumino/disposable": ^2.1.2
2087+
"@lumino/domutils": ^2.0.1
2088+
"@lumino/keyboard": ^2.0.1
2089+
"@lumino/signaling": ^2.1.2
2090+
"@lumino/virtualdom": ^2.0.1
2091+
checksum: e4e3ee279f2a5e8d68e4ce142c880333f5542f90c684972402356936ecb5cf5e07163800b59e7cb8c911cbdb4e5089edcc5dd2990bc8db10c87517268de1fc5d
2092+
languageName: node
2093+
linkType: hard
2094+
20802095
"@lumino/commands@npm:^1.21.1":
20812096
version: 1.21.1
20822097
resolution: "@lumino/commands@npm:1.21.1"
@@ -2092,22 +2107,7 @@ __metadata:
20922107
languageName: node
20932108
linkType: hard
20942109

2095-
"@lumino/commands@npm:^2.1.3":
2096-
version: 2.1.3
2097-
resolution: "@lumino/commands@npm:2.1.3"
2098-
dependencies:
2099-
"@lumino/algorithm": ^2.0.1
2100-
"@lumino/coreutils": ^2.1.2
2101-
"@lumino/disposable": ^2.1.2
2102-
"@lumino/domutils": ^2.0.1
2103-
"@lumino/keyboard": ^2.0.1
2104-
"@lumino/signaling": ^2.1.2
2105-
"@lumino/virtualdom": ^2.0.1
2106-
checksum: e4e3ee279f2a5e8d68e4ce142c880333f5542f90c684972402356936ecb5cf5e07163800b59e7cb8c911cbdb4e5089edcc5dd2990bc8db10c87517268de1fc5d
2107-
languageName: node
2108-
linkType: hard
2109-
2110-
"@lumino/coreutils@npm:^1.11.0 || ^2.0.0, @lumino/coreutils@npm:^1.11.0 || ^2.1.2, @lumino/coreutils@npm:^1.11.1 || ^2.1, @lumino/coreutils@npm:^2.1.2":
2110+
"@lumino/coreutils@npm:^1 || ^2, @lumino/coreutils@npm:^1.11.0 || ^2.0.0, @lumino/coreutils@npm:^1.11.0 || ^2.1.2, @lumino/coreutils@npm:^1.11.1 || ^2.1, @lumino/coreutils@npm:^2.1.2":
21112111
version: 2.1.2
21122112
resolution: "@lumino/coreutils@npm:2.1.2"
21132113
checksum: 7865317ac0676b448d108eb57ab5d8b2a17c101995c0f7a7106662d9fe6c859570104525f83ee3cda12ae2e326803372206d6f4c1f415a5b59e4158a7b81066f
@@ -2123,7 +2123,7 @@ __metadata:
21232123
languageName: node
21242124
linkType: hard
21252125

2126-
"@lumino/datagrid@npm:^2.2.0":
2126+
"@lumino/datagrid@npm:^1 || ^2":
21272127
version: 2.2.0
21282128
resolution: "@lumino/datagrid@npm:2.2.0"
21292129
dependencies:
@@ -2140,7 +2140,7 @@ __metadata:
21402140
languageName: node
21412141
linkType: hard
21422142

2143-
"@lumino/default-theme@npm:^2.1.3":
2143+
"@lumino/default-theme@npm:^1 || ^2":
21442144
version: 2.1.3
21452145
resolution: "@lumino/default-theme@npm:2.1.3"
21462146
dependencies:
@@ -2169,20 +2169,20 @@ __metadata:
21692169
languageName: node
21702170
linkType: hard
21712171

2172+
"@lumino/domutils@npm:^1 || ^2, @lumino/domutils@npm:^2.0.1":
2173+
version: 2.0.1
2174+
resolution: "@lumino/domutils@npm:2.0.1"
2175+
checksum: 61fa0ab226869dfbb763fc426790cf5a43b7d6f4cea1364c6dd56d61c44bff05eea188d33ff847449608ef58ed343161bee15c19b96f35410e4ee35815dc611a
2176+
languageName: node
2177+
linkType: hard
2178+
21722179
"@lumino/domutils@npm:^1.8.2":
21732180
version: 1.8.2
21742181
resolution: "@lumino/domutils@npm:1.8.2"
21752182
checksum: 196f25316a17cd8df8f11dbe17f10cbd96e5ce166ea97aab6402307dc554382423d860859bb5d05226f05909748b781fb281bb9220690fe1f3ddc716072c2ed5
21762183
languageName: node
21772184
linkType: hard
21782185

2179-
"@lumino/domutils@npm:^2.0.1":
2180-
version: 2.0.1
2181-
resolution: "@lumino/domutils@npm:2.0.1"
2182-
checksum: 61fa0ab226869dfbb763fc426790cf5a43b7d6f4cea1364c6dd56d61c44bff05eea188d33ff847449608ef58ed343161bee15c19b96f35410e4ee35815dc611a
2183-
languageName: node
2184-
linkType: hard
2185-
21862186
"@lumino/dragdrop@npm:^1.14.5":
21872187
version: 1.14.5
21882188
resolution: "@lumino/dragdrop@npm:1.14.5"
@@ -2217,6 +2217,16 @@ __metadata:
22172217
languageName: node
22182218
linkType: hard
22192219

2220+
"@lumino/messaging@npm:^1 || ^2, @lumino/messaging@npm:^2.0.1":
2221+
version: 2.0.1
2222+
resolution: "@lumino/messaging@npm:2.0.1"
2223+
dependencies:
2224+
"@lumino/algorithm": ^2.0.1
2225+
"@lumino/collections": ^2.0.1
2226+
checksum: 964c4651c374b17452b4252b7d71500b32d2ecd87c192fc5bcf5d3bd1070661d78d07edcac8eca7d1d6fd50aa25992505485e1296d6dd995691b8e349b652045
2227+
languageName: node
2228+
linkType: hard
2229+
22202230
"@lumino/messaging@npm:^1, @lumino/messaging@npm:^1.10.1 || ^2.1, @lumino/messaging@npm:^1.10.3":
22212231
version: 1.10.3
22222232
resolution: "@lumino/messaging@npm:1.10.3"
@@ -2227,16 +2237,6 @@ __metadata:
22272237
languageName: node
22282238
linkType: hard
22292239

2230-
"@lumino/messaging@npm:^2.0.1":
2231-
version: 2.0.1
2232-
resolution: "@lumino/messaging@npm:2.0.1"
2233-
dependencies:
2234-
"@lumino/algorithm": ^2.0.1
2235-
"@lumino/collections": ^2.0.1
2236-
checksum: 964c4651c374b17452b4252b7d71500b32d2ecd87c192fc5bcf5d3bd1070661d78d07edcac8eca7d1d6fd50aa25992505485e1296d6dd995691b8e349b652045
2237-
languageName: node
2238-
linkType: hard
2239-
22402240
"@lumino/polling@npm:^2.1.2":
22412241
version: 2.1.2
22422242
resolution: "@lumino/polling@npm:2.1.2"
@@ -2262,7 +2262,7 @@ __metadata:
22622262
languageName: node
22632263
linkType: hard
22642264

2265-
"@lumino/signaling@npm:^1.10.0 || ^2.0.0, @lumino/signaling@npm:^2.1.2":
2265+
"@lumino/signaling@npm:^1 || ^2, @lumino/signaling@npm:^1.10.0 || ^2.0.0, @lumino/signaling@npm:^2.1.2":
22662266
version: 2.1.2
22672267
resolution: "@lumino/signaling@npm:2.1.2"
22682268
dependencies:
@@ -2282,6 +2282,15 @@ __metadata:
22822282
languageName: node
22832283
linkType: hard
22842284

2285+
"@lumino/virtualdom@npm:^1 || ^2, @lumino/virtualdom@npm:^2.0.1":
2286+
version: 2.0.1
2287+
resolution: "@lumino/virtualdom@npm:2.0.1"
2288+
dependencies:
2289+
"@lumino/algorithm": ^2.0.1
2290+
checksum: cf59b6f15b430e13e9e657b7a0619b9056cd9ea7b2a87f407391d071c501b77403c302b6a66dca510382045e75b2e3fe551630bb391f1c6b33678057d4bec164
2291+
languageName: node
2292+
linkType: hard
2293+
22852294
"@lumino/virtualdom@npm:^1.14.3":
22862295
version: 1.14.3
22872296
resolution: "@lumino/virtualdom@npm:1.14.3"
@@ -2291,15 +2300,6 @@ __metadata:
22912300
languageName: node
22922301
linkType: hard
22932302

2294-
"@lumino/virtualdom@npm:^2.0.1":
2295-
version: 2.0.1
2296-
resolution: "@lumino/virtualdom@npm:2.0.1"
2297-
dependencies:
2298-
"@lumino/algorithm": ^2.0.1
2299-
checksum: cf59b6f15b430e13e9e657b7a0619b9056cd9ea7b2a87f407391d071c501b77403c302b6a66dca510382045e75b2e3fe551630bb391f1c6b33678057d4bec164
2300-
languageName: node
2301-
linkType: hard
2302-
23032303
"@lumino/widgets@npm:^1":
23042304
version: 1.37.2
23052305
resolution: "@lumino/widgets@npm:1.37.2"
@@ -2319,7 +2319,7 @@ __metadata:
23192319
languageName: node
23202320
linkType: hard
23212321

2322-
"@lumino/widgets@npm:^1.30.0 || ^2.1, @lumino/widgets@npm:^1.37.2 || ^2.3.0, @lumino/widgets@npm:^2.3.0":
2322+
"@lumino/widgets@npm:^1 || ^2, @lumino/widgets@npm:^1.30.0 || ^2.1, @lumino/widgets@npm:^1.37.2 || ^2.3.0, @lumino/widgets@npm:^2.3.0":
23232323
version: 2.3.0
23242324
resolution: "@lumino/widgets@npm:2.3.0"
23252325
dependencies:
@@ -6276,20 +6276,20 @@ __metadata:
62766276
"@babel/core": ^7.6.3
62776277
"@babel/preset-env": ^7.6.3
62786278
"@babel/preset-typescript": ^7.6.0
6279-
"@jupyter-widgets/base": ^2 || ^3 || ^4 || ^6.0.0
6280-
"@jupyterlab/apputils": ^4.1.5
6279+
"@jupyter-widgets/base": ^2 || ^3 || ^4 || ^6
6280+
"@jupyterlab/apputils": ^3 || ^4
62816281
"@jupyterlab/builder": ^4.0.5
6282-
"@lumino/algorithm": ^2.0.1
6283-
"@lumino/application": ^2.2.1
6284-
"@lumino/commands": ^2.1.3
6285-
"@lumino/coreutils": ^2.1.2
6286-
"@lumino/datagrid": ^2.2.0
6287-
"@lumino/default-theme": ^2.1.3
6288-
"@lumino/domutils": ^2.0.1
6289-
"@lumino/messaging": ^2.0.1
6290-
"@lumino/signaling": ^2.1.2
6291-
"@lumino/virtualdom": ^2.0.1
6292-
"@lumino/widgets": ^2.3.0
6282+
"@lumino/algorithm": ^1 || ^2
6283+
"@lumino/application": ^1 || ^2
6284+
"@lumino/commands": ^1 || ^2
6285+
"@lumino/coreutils": ^1 || ^2
6286+
"@lumino/datagrid": ^1 || ^2
6287+
"@lumino/default-theme": ^1 || ^2
6288+
"@lumino/domutils": ^1 || ^2
6289+
"@lumino/messaging": ^1 || ^2
6290+
"@lumino/signaling": ^1 || ^2
6291+
"@lumino/virtualdom": ^1 || ^2
6292+
"@lumino/widgets": ^1 || ^2
62936293
"@types/jest": ^27.4.1
62946294
"@types/node": ^10.11.6
62956295
"@types/underscore": ^1.11.4

0 commit comments

Comments
 (0)