Skip to content

Commit

Permalink
Merge pull request #1258 from thewtex/python-wasm-pixi
Browse files Browse the repository at this point in the history
python wasm pixi
  • Loading branch information
thewtex authored Oct 28, 2024
2 parents 2bbfc74 + 542cbee commit 0b65b99
Show file tree
Hide file tree
Showing 102 changed files with 58,252 additions and 290 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ jobs:
run: |
pnpm run --aggregate-output --filter itk-wasm build
- name: Build @itk-wasm/demo-app
run: |
pnpm run --aggregate-output --filter '@itk-wasm/demo-app' build
- name: Build build:gen:typescript
run: |
pnpm run --aggregate-output --filter "@itk-wasm/${{ matrix.package }}-build..." build:gen:typescript
Expand Down Expand Up @@ -120,6 +124,10 @@ jobs:
run: |
pnpm run --aggregate-output --filter itk-wasm build
- name: Build @itk-wasm/demo-app
run: |
pnpm run --aggregate-output --filter '@itk-wasm/demo-app' build
- name: Build build:gen:typescript
run: |
pnpm run --aggregate-output build:gen:typescript
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/javascript-typescript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,13 @@ jobs:
run: |
pnpm run --aggregate-output --filter itk-wasm build
- name: Build @itk-wasm/demo-app
run: |
pnpm run --aggregate-output --filter '@itk-wasm/demo-app' build
- name: Build build:gen:typescript
run: |
pnpm run --aggregate-output build:gen:typescript
pnpm run --aggregate-output --filter "@itk-wasm/${{ matrix.package }}-build..." build:gen:typescript
- name: Build typescript
run: |
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/python-wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- uses: prefix-dev/[email protected]

- name: Set up Python ${{ env.python-version }}
uses: actions/setup-python@v5
with:
Expand Down Expand Up @@ -59,10 +61,6 @@ jobs:
run: |
pnpm run --aggregate-output --filter "@itk-wasm/${{ matrix.package }}-build" bindgen:python
- name: Build build:micromamba
run: |
pnpm run --aggregate-output --filter "@itk-wasm/${{ matrix.package }}-build" build:micromamba
- name: Build build:python:wasi
if: ${{ matrix.os == 'ubuntu-22.04' || (matrix.package != 'mesh-io' && matrix.package != 'image-io' && matrix.package != 'downsample' ) }}
run: |
Expand Down
6 changes: 4 additions & 2 deletions docs/development/hacking_itk_wasm.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## TLDR

Install Podman, and
Install [Podman] and [Pixi], and

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

## Build environment Docker images

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

To pull the `latest` the build environment Docker images,
Expand Down Expand Up @@ -235,6 +235,8 @@ and rebuild whenever the documentation changes.
[ITK]: https://docs.itk.org
[ITK Software Guide]: https://itk.org/ItkSoftwareGuide.pdf
[Node.js / NPM]: https://nodejs.org/en/download/
[Podman]: https://podman.io/docs/installation
[Pixi]: https://pixi.sh/
[pnpm workspace]: https://pnpm.io/workspaces
[PNPM]: https://pnpm.io/
[pnpm filters]: https://pnpm.io/filtering
Expand Down
2 changes: 1 addition & 1 deletion packages/compare-images/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ dist/
test/
package-lock.json
typescript/test/browser/demo-app/public
micromamba/
pyodide/
1 change: 1 addition & 0 deletions packages/compare-images/.npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
git-checks=false
11 changes: 0 additions & 11 deletions packages/compare-images/environment.yml

This file was deleted.

21 changes: 8 additions & 13 deletions packages/compare-images/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"name": "@itk-wasm/compare-images-build",
"version": "1.0.0",
"version": "5.2.3",
"private": true,
"packageManager": "[email protected]",
"description": "scripts to generate @itk-wasm/compare-stringify itk-wasm artifacts.",
"description": "@itk-wasm/compare-stringify build configuration",
"type": "module",
"itk-wasm": {
"emscripten-docker-image": "itkwasm/emscripten:latest",
Expand All @@ -23,26 +22,22 @@
"build:emscripten:debug": "itk-wasm pnpm-script build:emscripten:debug",
"build:wasi": "itk-wasm pnpm-script build:wasi",
"build:wasi:debug": "itk-wasm pnpm-script build:wasi:debug",
"build:python:wasi": "itk-wasm pnpm-script build:python:wasi",
"build:python:wasi": "echo 'No build:python:wasi script required with pixi'",
"bindgen:typescript": "itk-wasm pnpm-script bindgen:typescript",
"bindgen:python": "itk-wasm pnpm-script bindgen:python",
"build:gen:typescript": "itk-wasm pnpm-script build:gen:typescript",
"build:gen:python": "itk-wasm pnpm-script build:gen:python",
"build:micromamba": "itk-wasm pnpm-script build:micromamba",
"build:python:versionSync": "itk-wasm pnpm-script build:python:versionSync",
"publish:python": "itk-wasm pnpm-script publish:python",
"build:gen:python": "pnpm build:wasi && pnpm bindgen:python",
"test": "pnpm test:data:download && pnpm build:gen:python && pnpm test:python",
"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",
"test:data:pack": "dam pack test/data test/data.tar.gz",
"test:python:wasi": "itk-wasm pnpm-script test:python:wasi",
"test:python:emscripten": "itk-wasm pnpm-script test:python:emscripten",
"test:python:dispatch": "itk-wasm pnpm-script test:python:emscripten",
"test:python": "itk-wasm pnpm-script test:python"
"test:python:wasi": "pnpm test:data:download && pixi run test-wasi",
"test:python:emscripten": "pnpm test:data:download && pixi run test-emscripten",
"test:python:dispatch": "pnpm test:data:download && pixi run test-dispatch",
"test:python": "pixi run test-python"
},
"license": "Apache-2.0",
"devDependencies": {
"@itk-wasm/dam": "^1.1.0",
"@thewtex/setup-micromamba": "^1.9.7",
"itk-wasm": "workspace:^",
"@itk-wasm/image-io-build": "workspace:^"
}
Expand Down
Loading

0 comments on commit 0b65b99

Please sign in to comment.