Skip to content

Commit

Permalink
Update CI
Browse files Browse the repository at this point in the history
Signed-off-by: martinRenou <[email protected]>
  • Loading branch information
martinRenou committed Sep 4, 2023
1 parent 7ad8b5a commit 25bd985
Show file tree
Hide file tree
Showing 6 changed files with 120 additions and 88 deletions.
36 changes: 34 additions & 2 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,27 @@ jobs:
user: __token__
password: ${{ secrets.pypi_password }}

build:
runs-on: ubuntu-latest
steps:
- name: setup python to build package
uses: actions/setup-python@v4
with:
python-version: '3.10'
- name: install build
run: python -m pip install build
- uses: actions/checkout@v3
- name: build package
run: python -m build --sdist --wheel . -o dist
- name: Upload builds
uses: actions/upload-artifact@v3
with:
name: dist ${{ github.run_number }}
path: ./dist

visual-regression-tests-ipw7:
runs-on: ubuntu-latest
needs: [build]

steps:
- name: Checkout
Expand All @@ -119,8 +138,14 @@ jobs:
auto-activate-base: false
channels: conda-forge

- uses: actions/download-artifact@v3
with:
name: dist ${{ github.run_number }}
path: ./dist

- name: Install the package
run: pip install -vv .
run: pip install -vv ipydatagrid*.whl
working-directory: dist

- name: Install dependencies
shell: bash -l {0}
Expand Down Expand Up @@ -150,6 +175,7 @@ jobs:
visual-regression-tests-ipw8:
runs-on: ubuntu-latest
needs: [build]

steps:
- name: Checkout
Expand All @@ -164,8 +190,14 @@ jobs:
auto-activate-base: false
channels: conda-forge

- uses: actions/download-artifact@v3
with:
name: dist ${{ github.run_number }}
path: ./dist

- name: Install the package
run: pip install -vv .
run: pip install -vv ipydatagrid*.whl
working-directory: dist

- name: Install dependencies
shell: bash -l {0}
Expand Down
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,19 @@
"watch:labextension": "jupyter labextension watch ."
},
"dependencies": {
"@jupyter-widgets/base": "^2 || ^3 || ^4 || ^6.0.0",
"@jupyterlab/apputils": "^4.1.5",
"@lumino/algorithm": "^2.0.1",
"@lumino/application": "^2.2.1",
"@lumino/commands": "^2.1.3",
"@lumino/coreutils": "^2.1.2",
"@lumino/datagrid": "^2.2.0",
"@lumino/default-theme": "^2.1.3",
"@lumino/domutils": "^2.0.1",
"@lumino/messaging": "^2.0.1",
"@lumino/signaling": "^2.1.2",
"@lumino/virtualdom": "^2.0.1",
"@lumino/widgets": "^2.3.0",
"@jupyter-widgets/base": "^2 || ^3 || ^4 || ^6",
"@jupyterlab/apputils": "^3 || ^4",
"@lumino/algorithm": "^1 || ^2",
"@lumino/application": "^1 || ^2",
"@lumino/commands": "^1 || ^2",
"@lumino/coreutils": "^1 || ^2",
"@lumino/datagrid": "^1 || ^2",
"@lumino/default-theme": "^1 || ^2",
"@lumino/domutils": "^1 || ^2",
"@lumino/messaging": "^1 || ^2",
"@lumino/signaling": "^1 || ^2",
"@lumino/virtualdom": "^1 || ^2",
"@lumino/widgets": "^1 || ^2",
"bqplot": "^0.5",
"core-js-pure": "^3.30.2",
"d3-array": "^2.2.0",
Expand Down
2 changes: 1 addition & 1 deletion test-environment-ipyw7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
- pandas >=1.0.0,<2.0.0
- bqplot
- scipy
- jupyterlab
- jupyterlab =3
- jupyter-packaging
- pytest
- nbval
Expand Down
2 changes: 1 addition & 1 deletion test-environment-ipyw8.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
- pandas >=1.0.0,<2.0.0
- bqplot
- scipy
- jupyterlab
- jupyterlab =4
- jupyter-packaging
- pytest
- nbval
Expand Down
4 changes: 2 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"compilerOptions": {
"declaration": true,
"esModuleInterop": true,
"module": "ES2015",
"module": "CommonJS",
"moduleResolution": "node",
"noEmitOnError": true,
"noUnusedLocals": true,
Expand All @@ -14,7 +14,7 @@
"strict": true,
// This allows us to initialize members in the "initialize" method
"strictPropertyInitialization": false,
"target": "ES2017"
"target": "es2017"
},
"include": ["js/*.ts", "js/*.tsx", "js/core/*.ts", "js/core/*.tsx"]
}
138 changes: 69 additions & 69 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1778,7 +1778,7 @@ __metadata:
languageName: node
linkType: hard

"@jupyter-widgets/base@npm:^2 || ^3 || ^4 || ^5 || ^6, @jupyter-widgets/base@npm:^2 || ^3 || ^4 || ^6.0.0":
"@jupyter-widgets/base@npm:^2 || ^3 || ^4 || ^5 || ^6, @jupyter-widgets/base@npm:^2 || ^3 || ^4 || ^6":
version: 6.0.5
resolution: "@jupyter-widgets/base@npm:6.0.5"
dependencies:
Expand Down Expand Up @@ -1809,7 +1809,7 @@ __metadata:
languageName: node
linkType: hard

"@jupyterlab/apputils@npm:^4.1.5":
"@jupyterlab/apputils@npm:^3 || ^4":
version: 4.1.5
resolution: "@jupyterlab/apputils@npm:4.1.5"
dependencies:
Expand Down Expand Up @@ -2034,21 +2034,21 @@ __metadata:
languageName: node
linkType: hard

"@lumino/algorithm@npm:^1 || ^2, @lumino/algorithm@npm:^2.0.1":
version: 2.0.1
resolution: "@lumino/algorithm@npm:2.0.1"
checksum: cbf7fcf6ee6b785ea502cdfddc53d61f9d353dcb9659343511d5cd4b4030be2ff2ca4c08daec42f84417ab0318a3d9972a17319fa5231693e109ab112dcf8000
languageName: node
linkType: hard

"@lumino/algorithm@npm:^1.9.2":
version: 1.9.2
resolution: "@lumino/algorithm@npm:1.9.2"
checksum: a89e7c63504236119634858e271db1cc649684d30ced5a6ebe2788af7c0837f1e05a6fd3047d8525eb756c42ce137f76b3688f75fd3ef915b71cd4f213dfbb96
languageName: node
linkType: hard

"@lumino/algorithm@npm:^2.0.1":
version: 2.0.1
resolution: "@lumino/algorithm@npm:2.0.1"
checksum: cbf7fcf6ee6b785ea502cdfddc53d61f9d353dcb9659343511d5cd4b4030be2ff2ca4c08daec42f84417ab0318a3d9972a17319fa5231693e109ab112dcf8000
languageName: node
linkType: hard

"@lumino/application@npm:^2.2.1":
"@lumino/application@npm:^1 || ^2, @lumino/application@npm:^2.2.1":
version: 2.2.1
resolution: "@lumino/application@npm:2.2.1"
dependencies:
Expand Down Expand Up @@ -2077,6 +2077,21 @@ __metadata:
languageName: node
linkType: hard

"@lumino/commands@npm:^1 || ^2, @lumino/commands@npm:^2.1.3":
version: 2.1.3
resolution: "@lumino/commands@npm:2.1.3"
dependencies:
"@lumino/algorithm": ^2.0.1
"@lumino/coreutils": ^2.1.2
"@lumino/disposable": ^2.1.2
"@lumino/domutils": ^2.0.1
"@lumino/keyboard": ^2.0.1
"@lumino/signaling": ^2.1.2
"@lumino/virtualdom": ^2.0.1
checksum: e4e3ee279f2a5e8d68e4ce142c880333f5542f90c684972402356936ecb5cf5e07163800b59e7cb8c911cbdb4e5089edcc5dd2990bc8db10c87517268de1fc5d
languageName: node
linkType: hard

"@lumino/commands@npm:^1.21.1":
version: 1.21.1
resolution: "@lumino/commands@npm:1.21.1"
Expand All @@ -2092,22 +2107,7 @@ __metadata:
languageName: node
linkType: hard

"@lumino/commands@npm:^2.1.3":
version: 2.1.3
resolution: "@lumino/commands@npm:2.1.3"
dependencies:
"@lumino/algorithm": ^2.0.1
"@lumino/coreutils": ^2.1.2
"@lumino/disposable": ^2.1.2
"@lumino/domutils": ^2.0.1
"@lumino/keyboard": ^2.0.1
"@lumino/signaling": ^2.1.2
"@lumino/virtualdom": ^2.0.1
checksum: e4e3ee279f2a5e8d68e4ce142c880333f5542f90c684972402356936ecb5cf5e07163800b59e7cb8c911cbdb4e5089edcc5dd2990bc8db10c87517268de1fc5d
languageName: node
linkType: hard

"@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":
"@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":
version: 2.1.2
resolution: "@lumino/coreutils@npm:2.1.2"
checksum: 7865317ac0676b448d108eb57ab5d8b2a17c101995c0f7a7106662d9fe6c859570104525f83ee3cda12ae2e326803372206d6f4c1f415a5b59e4158a7b81066f
Expand All @@ -2123,7 +2123,7 @@ __metadata:
languageName: node
linkType: hard

"@lumino/datagrid@npm:^2.2.0":
"@lumino/datagrid@npm:^1 || ^2":
version: 2.2.0
resolution: "@lumino/datagrid@npm:2.2.0"
dependencies:
Expand All @@ -2140,7 +2140,7 @@ __metadata:
languageName: node
linkType: hard

"@lumino/default-theme@npm:^2.1.3":
"@lumino/default-theme@npm:^1 || ^2":
version: 2.1.3
resolution: "@lumino/default-theme@npm:2.1.3"
dependencies:
Expand Down Expand Up @@ -2169,20 +2169,20 @@ __metadata:
languageName: node
linkType: hard

"@lumino/domutils@npm:^1 || ^2, @lumino/domutils@npm:^2.0.1":
version: 2.0.1
resolution: "@lumino/domutils@npm:2.0.1"
checksum: 61fa0ab226869dfbb763fc426790cf5a43b7d6f4cea1364c6dd56d61c44bff05eea188d33ff847449608ef58ed343161bee15c19b96f35410e4ee35815dc611a
languageName: node
linkType: hard

"@lumino/domutils@npm:^1.8.2":
version: 1.8.2
resolution: "@lumino/domutils@npm:1.8.2"
checksum: 196f25316a17cd8df8f11dbe17f10cbd96e5ce166ea97aab6402307dc554382423d860859bb5d05226f05909748b781fb281bb9220690fe1f3ddc716072c2ed5
languageName: node
linkType: hard

"@lumino/domutils@npm:^2.0.1":
version: 2.0.1
resolution: "@lumino/domutils@npm:2.0.1"
checksum: 61fa0ab226869dfbb763fc426790cf5a43b7d6f4cea1364c6dd56d61c44bff05eea188d33ff847449608ef58ed343161bee15c19b96f35410e4ee35815dc611a
languageName: node
linkType: hard

"@lumino/dragdrop@npm:^1.14.5":
version: 1.14.5
resolution: "@lumino/dragdrop@npm:1.14.5"
Expand Down Expand Up @@ -2217,6 +2217,16 @@ __metadata:
languageName: node
linkType: hard

"@lumino/messaging@npm:^1 || ^2, @lumino/messaging@npm:^2.0.1":
version: 2.0.1
resolution: "@lumino/messaging@npm:2.0.1"
dependencies:
"@lumino/algorithm": ^2.0.1
"@lumino/collections": ^2.0.1
checksum: 964c4651c374b17452b4252b7d71500b32d2ecd87c192fc5bcf5d3bd1070661d78d07edcac8eca7d1d6fd50aa25992505485e1296d6dd995691b8e349b652045
languageName: node
linkType: hard

"@lumino/messaging@npm:^1, @lumino/messaging@npm:^1.10.1 || ^2.1, @lumino/messaging@npm:^1.10.3":
version: 1.10.3
resolution: "@lumino/messaging@npm:1.10.3"
Expand All @@ -2227,16 +2237,6 @@ __metadata:
languageName: node
linkType: hard

"@lumino/messaging@npm:^2.0.1":
version: 2.0.1
resolution: "@lumino/messaging@npm:2.0.1"
dependencies:
"@lumino/algorithm": ^2.0.1
"@lumino/collections": ^2.0.1
checksum: 964c4651c374b17452b4252b7d71500b32d2ecd87c192fc5bcf5d3bd1070661d78d07edcac8eca7d1d6fd50aa25992505485e1296d6dd995691b8e349b652045
languageName: node
linkType: hard

"@lumino/polling@npm:^2.1.2":
version: 2.1.2
resolution: "@lumino/polling@npm:2.1.2"
Expand All @@ -2262,7 +2262,7 @@ __metadata:
languageName: node
linkType: hard

"@lumino/signaling@npm:^1.10.0 || ^2.0.0, @lumino/signaling@npm:^2.1.2":
"@lumino/signaling@npm:^1 || ^2, @lumino/signaling@npm:^1.10.0 || ^2.0.0, @lumino/signaling@npm:^2.1.2":
version: 2.1.2
resolution: "@lumino/signaling@npm:2.1.2"
dependencies:
Expand All @@ -2282,6 +2282,15 @@ __metadata:
languageName: node
linkType: hard

"@lumino/virtualdom@npm:^1 || ^2, @lumino/virtualdom@npm:^2.0.1":
version: 2.0.1
resolution: "@lumino/virtualdom@npm:2.0.1"
dependencies:
"@lumino/algorithm": ^2.0.1
checksum: cf59b6f15b430e13e9e657b7a0619b9056cd9ea7b2a87f407391d071c501b77403c302b6a66dca510382045e75b2e3fe551630bb391f1c6b33678057d4bec164
languageName: node
linkType: hard

"@lumino/virtualdom@npm:^1.14.3":
version: 1.14.3
resolution: "@lumino/virtualdom@npm:1.14.3"
Expand All @@ -2291,15 +2300,6 @@ __metadata:
languageName: node
linkType: hard

"@lumino/virtualdom@npm:^2.0.1":
version: 2.0.1
resolution: "@lumino/virtualdom@npm:2.0.1"
dependencies:
"@lumino/algorithm": ^2.0.1
checksum: cf59b6f15b430e13e9e657b7a0619b9056cd9ea7b2a87f407391d071c501b77403c302b6a66dca510382045e75b2e3fe551630bb391f1c6b33678057d4bec164
languageName: node
linkType: hard

"@lumino/widgets@npm:^1":
version: 1.37.2
resolution: "@lumino/widgets@npm:1.37.2"
Expand All @@ -2319,7 +2319,7 @@ __metadata:
languageName: node
linkType: hard

"@lumino/widgets@npm:^1.30.0 || ^2.1, @lumino/widgets@npm:^1.37.2 || ^2.3.0, @lumino/widgets@npm:^2.3.0":
"@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":
version: 2.3.0
resolution: "@lumino/widgets@npm:2.3.0"
dependencies:
Expand Down Expand Up @@ -6276,20 +6276,20 @@ __metadata:
"@babel/core": ^7.6.3
"@babel/preset-env": ^7.6.3
"@babel/preset-typescript": ^7.6.0
"@jupyter-widgets/base": ^2 || ^3 || ^4 || ^6.0.0
"@jupyterlab/apputils": ^4.1.5
"@jupyter-widgets/base": ^2 || ^3 || ^4 || ^6
"@jupyterlab/apputils": ^3 || ^4
"@jupyterlab/builder": ^4.0.5
"@lumino/algorithm": ^2.0.1
"@lumino/application": ^2.2.1
"@lumino/commands": ^2.1.3
"@lumino/coreutils": ^2.1.2
"@lumino/datagrid": ^2.2.0
"@lumino/default-theme": ^2.1.3
"@lumino/domutils": ^2.0.1
"@lumino/messaging": ^2.0.1
"@lumino/signaling": ^2.1.2
"@lumino/virtualdom": ^2.0.1
"@lumino/widgets": ^2.3.0
"@lumino/algorithm": ^1 || ^2
"@lumino/application": ^1 || ^2
"@lumino/commands": ^1 || ^2
"@lumino/coreutils": ^1 || ^2
"@lumino/datagrid": ^1 || ^2
"@lumino/default-theme": ^1 || ^2
"@lumino/domutils": ^1 || ^2
"@lumino/messaging": ^1 || ^2
"@lumino/signaling": ^1 || ^2
"@lumino/virtualdom": ^1 || ^2
"@lumino/widgets": ^1 || ^2
"@types/jest": ^27.4.1
"@types/node": ^10.11.6
"@types/underscore": ^1.11.4
Expand Down

0 comments on commit 25bd985

Please sign in to comment.