Skip to content

Commit 16f7818

Browse files
authored
Merge pull request #1099 from thewtex/pyodide-0.25.0
Pyodide 0.25.0
2 parents 7ddf1d0 + f4c6101 commit 16f7818

File tree

12 files changed

+191
-16
lines changed

12 files changed

+191
-16
lines changed

.github/workflows/cypress.yml

Lines changed: 62 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ defaults:
99
jobs:
1010

1111
test-cypress:
12-
name: itk-wasm browser tests
12+
name: itk-wasm reference packages browser tests
1313
runs-on: ubuntu-22.04
1414
strategy:
1515
max-parallel: 3
@@ -63,6 +63,59 @@ jobs:
6363
start: pnpm start
6464
config: video=true
6565

66+
- uses: actions/upload-artifact@v3
67+
if: always()
68+
with:
69+
name: cypress-videos
70+
path: packages/${{ matrix.package }}/typescript/cypress/videos
71+
if-no-files-found: ignore
72+
73+
- name: Test with Firefox
74+
if: ${{ matrix.package != 'dicom' }}
75+
uses: cypress-io/github-action@v6
76+
with:
77+
browser: firefox
78+
working-directory: packages/${{ matrix.package }}/typescript
79+
install: false
80+
start: pnpm start
81+
82+
- uses: actions/upload-artifact@v3
83+
if: failure()
84+
with:
85+
name: cypress-screenshots
86+
path: packages/${{ matrix.package }}/typescript/cypress/screenshots
87+
if-no-files-found: ignore
88+
89+
test-itk-wasm-cypress:
90+
name: itk-wasm browser tests
91+
runs-on: ubuntu-22.04
92+
93+
steps:
94+
- name: Checkout
95+
uses: actions/checkout@v4
96+
97+
- name: Free Disk Space (Ubuntu)
98+
uses: jlumbroso/free-disk-space@main
99+
with:
100+
large-packages: false
101+
102+
- uses: actions/setup-node@v4
103+
with:
104+
node-version: '20'
105+
106+
- name: Install
107+
uses: pnpm/action-setup@v2
108+
with:
109+
version: 8
110+
run_install: true
111+
112+
- name: Build itk-wasm
113+
run: |
114+
pnpm run --aggregate-output --filter itk-wasm build
115+
# Test deps
116+
pnpm run --aggregate-output --filter "@itk-wasm/mesh-io" build
117+
pnpm run --aggregate-output --filter "@itk-wasm/image-io" build
118+
66119
- name: Test itk-wasm with Chrome
67120
uses: cypress-io/github-action@v6
68121
with:
@@ -74,25 +127,28 @@ jobs:
74127
wait-on: 'http://localhost:5173'
75128
wait-on-timeout: 360
76129

77-
- uses: actions/upload-artifact@v3
130+
- uses: actions/upload-artifact@v4
78131
if: always()
79132
with:
80133
name: cypress-videos
81-
path: packages/${{ matrix.package }}/typescript/cypress/videos
134+
path: packages/core/typescript/itk-wasm/cypress/videos
82135
if-no-files-found: ignore
83136

84137
- name: Test with Firefox
85138
if: ${{ matrix.package != 'dicom' }}
86139
uses: cypress-io/github-action@v6
87140
with:
88141
browser: firefox
89-
working-directory: packages/${{ matrix.package }}/typescript
142+
working-directory: packages/core/typescript/itk-wasm
90143
install: false
144+
config: video=true
91145
start: pnpm start
146+
wait-on: 'http://localhost:5173'
147+
wait-on-timeout: 360
92148

93-
- uses: actions/upload-artifact@v3
149+
- uses: actions/upload-artifact@v4
94150
if: failure()
95151
with:
96152
name: cypress-screenshots
97-
path: packages/${{ matrix.package }}/typescript/cypress/screenshots
153+
path: packages/core/typescript/itk-wasm/cypress/videos
98154
if-no-files-found: ignore

packages/compress-stringify/python/itkwasm-compress-stringify-emscripten/itkwasm_compress_stringify_emscripten/js_package.py

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

packages/core/typescript/itk-wasm/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"cypress:runChrome": "pnpm exec cypress run --config defaultCommandTimeout=8000 --browser chrome",
3333
"cypress:runFirefox": "pnpm exec cypress run --config defaultCommandTimeout=8000 --browser firefox",
3434
"cypress:runFirefox:ci": "pnpm cypress:install && pnpm exec cypress run --config defaultCommandTimeout=8000 --browser firefox",
35-
"start": "pnpm build:workerBundleForTesting && cd test/pipelines/typescript && npm i && npm link ../../.. && npm run build && npm run start",
35+
"start": "pnpm build:workerBundleForTesting && cd test/pipelines/typescript && pnpm build && pnpm start",
3636
"test:wasi": "pnpm test:buildTestPipelines:wasi && pnpm test:runTestPipelines && pnpm test:bindgenTestPipelines:python",
3737
"test": "pnpm test:lint && pnpm test:testPipelines && pnpm test:node && pnpm test:bindgenTestPipelines:python && pnpm test:browser:chrome && pnpm test:browser:firefox",
3838
"test:lint": "ts-standard --fix \"src/**/*.ts\" && standard --fix \"test/node/**/*.js\"",

packages/core/typescript/itk-wasm/src/cli/pnpm-script.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ function configValue(
3838

3939
async function downloadPyodide(unpackPath, pkg) {
4040
const pyodideDamCid =
41-
'bafybeienencwyms2wzlzx6itqe4tw7rptocwaxihqf2sj6jej2hhoy7jxa'
41+
'bafybeieoibjer4bhhfls53m34rjpyfyp54oxyqimceyaia2k7syosw4jtq'
4242
const pyodideDamUrls = [
43-
'https://github.com/InsightSoftwareConsortium/itk-wasm/releases/download/itk-wasm-v1.0.0-b.158/pyodide-0.24.1-itkwasm-1.0b145-test-dist.tar.bz2'
43+
'https://github.com/InsightSoftwareConsortium/itk-wasm/releases/download/itk-wasm-v1.0.0-b.171/pyodide-0.25.0-itkwasm-1.0b169-test-dist.tar.bz2'
4444
]
4545
await damDownload(
4646
unpackPath,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
const version = "1.0.0-b.171";
1+
const version = '1.0.0-b.171'
22

33
export default version
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
{
2+
"name": "test-pipelines",
3+
"version": "1.0.0",
4+
"packageManager": "pnpm@8.11.0",
5+
"description": "Exercise interface types for bindgen",
6+
"type": "module",
7+
"module": "./dist/index.js",
8+
"types": "./dist/index-all.d.ts",
9+
"exports": {
10+
".": {
11+
"types": "./dist/index-all.d.ts",
12+
"browser": "./dist/index.js",
13+
"node": "./dist/index-node.js",
14+
"default": "./dist/index-all.js"
15+
}
16+
},
17+
"scripts": {
18+
"start": "pnpm copyShoelaceAssets && vite",
19+
"test": "echo \"No test specified\"",
20+
"build": "pnpm build:tsc && pnpm build:browser:workerEmbedded && pnpm build:browser:workerEmbeddedMin && pnpm build:demo",
21+
"build:browser:workerEmbedded": "esbuild --loader:.worker.js=dataurl --bundle --format=esm --outfile=./dist/bundle/index-worker-embedded.js ./src/index-worker-embedded.ts",
22+
"build:browser:workerEmbeddedMin": "esbuild --minify --loader:.worker.js=dataurl --bundle --format=esm --outfile=./dist/bundle/index-worker-embedded.min.js ./src/index-worker-embedded.min.ts",
23+
"build:version": "node -p \"'const version = ' + JSON.stringify(require('./package.json').version) + '\\nexport default version\\n'\" > src/version.ts",
24+
"build:tsc": "pnpm build:version && tsc --pretty",
25+
"copyShoelaceAssets": "shx mkdir -p test/browser/demo-app/public && shx cp -r node_modules/@shoelace-style/shoelace/dist/assets test/browser/demo-app/public/",
26+
"build:demo": "pnpm copyShoelaceAssets && vite build"
27+
},
28+
"keywords": [
29+
"itk",
30+
"wasm",
31+
"webassembly",
32+
"wasi"
33+
],
34+
"author": "",
35+
"license": "Apache-2.0",
36+
"dependencies": {
37+
"itk-wasm": "workspace:*"
38+
},
39+
"devDependencies": {
40+
"@itk-wasm/image-io": "workspace:*",
41+
"@itk-wasm/mesh-io": "workspace:*",
42+
"@shoelace-style/shoelace": "^2.12.0",
43+
"@types/node": "^20.2.5",
44+
"esbuild": "^0.19.8",
45+
"shx": "^0.3.4",
46+
"typescript": "^5.3.2",
47+
"vite": "^4.5.0",
48+
"vite-plugin-static-copy": "^0.17.0"
49+
}
50+
}

packages/dicom/python/itkwasm-dicom-emscripten/itkwasm_dicom_emscripten/js_package.py

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

packages/downsample/python/itkwasm-downsample-emscripten/itkwasm_downsample_emscripten/js_package.py

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

packages/image-io/python/itkwasm-image-io-emscripten/itkwasm_image_io_emscripten/js_package.py

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

packages/mesh-io/python/itkwasm-mesh-io-emscripten/itkwasm_mesh_io_emscripten/js_package.py

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)