Skip to content

Commit 0b65b99

Browse files
authored
Merge pull request #1258 from thewtex/python-wasm-pixi
python wasm pixi
2 parents 2bbfc74 + 542cbee commit 0b65b99

File tree

102 files changed

+58252
-290
lines changed

Some content is hidden

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

102 files changed

+58252
-290
lines changed

.github/workflows/cypress.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ jobs:
4545
run: |
4646
pnpm run --aggregate-output --filter itk-wasm build
4747
48+
- name: Build @itk-wasm/demo-app
49+
run: |
50+
pnpm run --aggregate-output --filter '@itk-wasm/demo-app' build
51+
4852
- name: Build build:gen:typescript
4953
run: |
5054
pnpm run --aggregate-output --filter "@itk-wasm/${{ matrix.package }}-build..." build:gen:typescript
@@ -120,6 +124,10 @@ jobs:
120124
run: |
121125
pnpm run --aggregate-output --filter itk-wasm build
122126
127+
- name: Build @itk-wasm/demo-app
128+
run: |
129+
pnpm run --aggregate-output --filter '@itk-wasm/demo-app' build
130+
123131
- name: Build build:gen:typescript
124132
run: |
125133
pnpm run --aggregate-output build:gen:typescript

.github/workflows/javascript-typescript.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,13 @@ jobs:
4646
run: |
4747
pnpm run --aggregate-output --filter itk-wasm build
4848
49+
- name: Build @itk-wasm/demo-app
50+
run: |
51+
pnpm run --aggregate-output --filter '@itk-wasm/demo-app' build
52+
4953
- name: Build build:gen:typescript
5054
run: |
51-
pnpm run --aggregate-output build:gen:typescript
55+
pnpm run --aggregate-output --filter "@itk-wasm/${{ matrix.package }}-build..." build:gen:typescript
5256
5357
- name: Build typescript
5458
run: |

.github/workflows/python-wasm.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ jobs:
3131
- name: Checkout
3232
uses: actions/checkout@v4
3333

34+
- uses: prefix-dev/[email protected]
35+
3436
- name: Set up Python ${{ env.python-version }}
3537
uses: actions/setup-python@v5
3638
with:
@@ -59,10 +61,6 @@ jobs:
5961
run: |
6062
pnpm run --aggregate-output --filter "@itk-wasm/${{ matrix.package }}-build" bindgen:python
6163
62-
- name: Build build:micromamba
63-
run: |
64-
pnpm run --aggregate-output --filter "@itk-wasm/${{ matrix.package }}-build" build:micromamba
65-
6664
- name: Build build:python:wasi
6765
if: ${{ matrix.os == 'ubuntu-22.04' || (matrix.package != 'mesh-io' && matrix.package != 'image-io' && matrix.package != 'downsample' ) }}
6866
run: |

docs/development/hacking_itk_wasm.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## TLDR
44

5-
Install Podman, and
5+
Install [Podman] and [Pixi], and
66

77
```sh
88
npm i -g pnpm
@@ -57,7 +57,7 @@ To prevent Git repository bloat, we add testing data through [CMake content link
5757

5858
## Build environment Docker images
5959

60-
Builds of the [wasm build environment Docker images](../introduction/parts.md#docker) or WebAssembly modules require [Podman](https://podman.io/docs/installation).
60+
Builds of the [wasm build environment Docker images](../introduction/parts.md#docker) or WebAssembly modules require [Podman].
6161
*Note*: on Linux, ensure the [`vfs` podman storage driver is not used for best performance](https://github.com/containers/podman/issues/13226#issuecomment-1555872420).
6262

6363
To pull the `latest` the build environment Docker images,
@@ -235,6 +235,8 @@ and rebuild whenever the documentation changes.
235235
[ITK]: https://docs.itk.org
236236
[ITK Software Guide]: https://itk.org/ItkSoftwareGuide.pdf
237237
[Node.js / NPM]: https://nodejs.org/en/download/
238+
[Podman]: https://podman.io/docs/installation
239+
[Pixi]: https://pixi.sh/
238240
[pnpm workspace]: https://pnpm.io/workspaces
239241
[PNPM]: https://pnpm.io/
240242
[pnpm filters]: https://pnpm.io/filtering

packages/compare-images/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ dist/
44
test/
55
package-lock.json
66
typescript/test/browser/demo-app/public
7-
micromamba/
7+
pyodide/

packages/compare-images/.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
git-checks=false

packages/compare-images/environment.yml

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

packages/compare-images/package.json

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
{
22
"name": "@itk-wasm/compare-images-build",
3-
"version": "1.0.0",
3+
"version": "5.2.3",
44
"private": true,
5-
"packageManager": "[email protected]",
6-
"description": "scripts to generate @itk-wasm/compare-stringify itk-wasm artifacts.",
5+
"description": "@itk-wasm/compare-stringify build configuration",
76
"type": "module",
87
"itk-wasm": {
98
"emscripten-docker-image": "itkwasm/emscripten:latest",
@@ -23,26 +22,22 @@
2322
"build:emscripten:debug": "itk-wasm pnpm-script build:emscripten:debug",
2423
"build:wasi": "itk-wasm pnpm-script build:wasi",
2524
"build:wasi:debug": "itk-wasm pnpm-script build:wasi:debug",
26-
"build:python:wasi": "itk-wasm pnpm-script build:python:wasi",
25+
"build:python:wasi": "echo 'No build:python:wasi script required with pixi'",
2726
"bindgen:typescript": "itk-wasm pnpm-script bindgen:typescript",
2827
"bindgen:python": "itk-wasm pnpm-script bindgen:python",
2928
"build:gen:typescript": "itk-wasm pnpm-script build:gen:typescript",
30-
"build:gen:python": "itk-wasm pnpm-script build:gen:python",
31-
"build:micromamba": "itk-wasm pnpm-script build:micromamba",
32-
"build:python:versionSync": "itk-wasm pnpm-script build:python:versionSync",
33-
"publish:python": "itk-wasm pnpm-script publish:python",
29+
"build:gen:python": "pnpm build:wasi && pnpm bindgen:python",
3430
"test": "pnpm test:data:download && pnpm build:gen:python && pnpm test:python",
3531
"test:data:download": "dam download test/data test/data.tar.gz bafybeiafli6egtmkcgany65po64w67hpqnmgwr5utqo6ycbbz7k5l33llu https://github.com/InsightSoftwareConsortium/ITK-Wasm/releases/download/itk-wasm-v1.0.0-b.171/compare-images-test-data.tar.gz",
3632
"test:data:pack": "dam pack test/data test/data.tar.gz",
37-
"test:python:wasi": "itk-wasm pnpm-script test:python:wasi",
38-
"test:python:emscripten": "itk-wasm pnpm-script test:python:emscripten",
39-
"test:python:dispatch": "itk-wasm pnpm-script test:python:emscripten",
40-
"test:python": "itk-wasm pnpm-script test:python"
33+
"test:python:wasi": "pnpm test:data:download && pixi run test-wasi",
34+
"test:python:emscripten": "pnpm test:data:download && pixi run test-emscripten",
35+
"test:python:dispatch": "pnpm test:data:download && pixi run test-dispatch",
36+
"test:python": "pixi run test-python"
4137
},
4238
"license": "Apache-2.0",
4339
"devDependencies": {
4440
"@itk-wasm/dam": "^1.1.0",
45-
"@thewtex/setup-micromamba": "^1.9.7",
4641
"itk-wasm": "workspace:^",
4742
"@itk-wasm/image-io-build": "workspace:^"
4843
}

0 commit comments

Comments
 (0)