Skip to content

Commit

Permalink
Merge pull request #1263 from thewtex/pixi-dev-package-bump
Browse files Browse the repository at this point in the history
pixi dev package bump
  • Loading branch information
thewtex authored Nov 5, 2024
2 parents 8ab8ab1 + 397634d commit ec64423
Show file tree
Hide file tree
Showing 117 changed files with 3,742 additions and 457 deletions.
22 changes: 9 additions & 13 deletions docs/development/hacking_itk_wasm.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@
Install [Podman] and [Pixi], and

```sh
npm i -g pnpm
pnpm install
pnpm build
pnpm test
pixi run build
pixi run test
```

and contribute the patch with standard GitHub best practices.
Expand Down Expand Up @@ -74,14 +72,13 @@ pixi run build-docker-images --with-debug

The `--with-debug` flag will also build the `latest-debug` tagged images.

To use these locally built images in the pnpm build, remove (*clean*) the old build artifacts from the repository first.
To use these locally built images in the pixi build, remove (*clean*) the old build artifacts from the repository first.

```sh
# Remove old build artifacts
pnpm clean
pixi run clean

pnpm install
pnpm build
pixi run build
```

## Command line interface (CLI)
Expand Down Expand Up @@ -137,10 +134,8 @@ hatch run test
To develop these packages, at the top level, run:

```sh
npm i -g pnpm
pnpm install
pnpm build
pnpm test
pixi run build
pixi run test
```

This will build and test the packages in order, according to their dependency topology, and the packages will use local workspace dependencies, including the `itk-wasm` CLI.
Expand All @@ -152,7 +147,8 @@ The `build` and `test` targets are high-level targets that call other targets. T
In development, it often useful to [build the wasm in debug mode](../cxx/tutorial/debugging.md). To create a debug build, at the root level, clean the tree, call `build:emscripten:debug` and `build:wasi:debug`, then `build` and `test` as usual:

```sh
pnpm clean
pixi run clean
pixi shell
pnpm build:emscripten:debug
pnpm build:wasi:debug
pnpm build
Expand Down
3 changes: 3 additions & 0 deletions itk_wasm_env.bash
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,6 @@ export ITK_WASM_DOWNSAMPLE_TEST_DATA_URLS=${ITK_WASM_DOWNSAMPLE_TEST_DATA_URLS:-

export ITK_WASM_MESH_IO_TEST_DATA_HASH=${ITK_WASM_MESH_IO_TEST_DATA_HASH:-$(cat packages/mesh-io/package.json | jq -e -r '."itk-wasm"."test-data-hash"')}
export ITK_WASM_MESH_IO_TEST_DATA_URLS=${ITK_WASM_MESH_IO_TEST_DATA_URLS:-$(cat packages/mesh-io/package.json | jq -e -r '."itk-wasm"."test-data-urls" | join(" ")')}

export ITK_WASM_TRANSFORM_IO_TEST_DATA_HASH=${ITK_WASM_TRANSFORM_IO_TEST_DATA_HASH:-$(cat packages/mesh-io/package.json | jq -e -r '."itk-wasm"."test-data-hash"')}
export ITK_WASM_TRANSFORM_IO_TEST_DATA_URLS=${ITK_WASM_TRANSFORM_IO_TEST_DATA_URLS:-$(cat packages/mesh-io/package.json | jq -e -r '."itk-wasm"."test-data-urls" | join(" ")')}
8 changes: 4 additions & 4 deletions packages/compare-images/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
"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": "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"
"test:python:wasi": "pnpm test:data:download && pixi run --manifest-path=./pixi.toml test-wasi",
"test:python:emscripten": "pnpm test:data:download && pixi run --manifest-path=./pixi.toml test-emscripten",
"test:python:dispatch": "pnpm test:data:download && pixi run --manifest-path=./pixi.toml test-dispatch",
"test:python": "pixi run --manifest-path=./pixi.toml test-python"
},
"license": "Apache-2.0",
"devDependencies": {
Expand Down
10 changes: 8 additions & 2 deletions packages/compare-images/pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ name = "compare-images"
platforms = ["win-64", "linux-64", "linux-aarch64", "osx-arm64"]
version = "0.1.0"

[tasks]

[dependencies]
python = "3.12.*"
pnpm = ">=9.12.1,<10"
Expand All @@ -20,6 +18,14 @@ m2w64-jq = ">=1.6.0,<2"
[target.unix.dependencies]
jq = ">=1.7.1,<2"

[tasks.build]
cmd = "pnpm run build"
description = "Build the project"

[tasks.test]
cmd = "pnpm run test"
description = "Run tests"

[tasks.version-sync-typescript]
cmd = '''version=$(cat package.json | jq .version) &&
jq ".version = $version" typescript/package.json > typescript/package.json.tmp &&
Expand Down
12 changes: 6 additions & 6 deletions packages/compare-meshes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
"itk-wasm": {
"emscripten-docker-image": "itkwasm/emscripten:latest",
"wasi-docker-image": "itkwasm/wasi:latest",
"test-data-hash": "bafybeiafli6egtmkcgany65po64w67hpqnmgwr5utqo6ycbbz7k5l33llu",
"test-data-hash": "bafybeigcqagjt67v4uutyrdefftxu23ihgnmjbgelxnkfy4x3zcfsfg3xm",
"test-data-urls": [
"https://github.com/InsightSoftwareConsortium/ITK-Wasm/releases/download/itk-wasm-v1.0.0-b.171/compare-images-test-data.tar.gz"
"https://bafybeiabirl7i5shb6sajmfkqycpi67i3vshpcto7d3x3up2w5h64yibji.ipfs.w3s.link/ipfs/bafybeiabirl7i5shb6sajmfkqycpi67i3vshpcto7d3x3up2w5h64yibji/data.tar.gz"
],
"package-description": "Compare meshes and polydata for regression testing.",
"typescript-package-name": "@itk-wasm/compare-meshes",
Expand All @@ -29,11 +29,11 @@
"build:gen:typescript": "itk-wasm pnpm-script build:gen:typescript",
"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 bafkreidioh62iouwzrrpavx7g72fdjxze7gp4cqpf36t4pdafcpcmx4zye https://github.com/InsightSoftwareConsortium/ITK-Wasm/releases/download/itk-wasm-v1.0.0-b.171/itkwasm-compare-meshes-test-data.tar.gz",
"test:data:download": "dam download test/data test/data.tar.gz bafkreidioh62iouwzrrpavx7g72fdjxze7gp4cqpf36t4pdafcpcmx4zye https://bafybeiabirl7i5shb6sajmfkqycpi67i3vshpcto7d3x3up2w5h64yibji.ipfs.w3s.link/ipfs/bafybeiabirl7i5shb6sajmfkqycpi67i3vshpcto7d3x3up2w5h64yibji/data.tar.gz",
"test:data:pack": "dam pack test/data test/data.tar.gz",
"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:wasi": "pnpm test:data:download && pixi run --manifest-path=./pixi.toml test-wasi",
"test:python:emscripten": "pnpm test:data:download && pixi run --manifest-path=./pixi.toml test-emscripten",
"test:python:dispatch": "pnpm test:data:download && pixi run --manifest-path=./pixi.toml test-dispatch",
"test:python": "itk-wasm pnpm-script test:python",
"test:wasi": "itk-wasm pnpm-script test:wasi"
},
Expand Down
10 changes: 8 additions & 2 deletions packages/compare-meshes/pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ name = "compare-meshes"
platforms = ["win-64", "linux-64", "linux-aarch64", "osx-arm64"]
version = "0.1.0"

[tasks]

[dependencies]
python = "3.12.*"
pnpm = ">=9.12.1,<10"
Expand All @@ -20,6 +18,14 @@ m2w64-jq = ">=1.6.0,<2"
[target.unix.dependencies]
jq = ">=1.7.1,<2"

[tasks.build]
cmd = "pnpm run build"
description = "Build the project"

[tasks.test]
cmd = "pnpm run test"
description = "Run tests"

[tasks.version-sync-typescript]
cmd = '''version=$(cat package.json | jq .version) &&
jq ".version = $version" typescript/package.json > typescript/package.json.tmp &&
Expand Down
8 changes: 4 additions & 4 deletions packages/compress-stringify/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
"test": "pnpm test:data:download && pnpm build:gen:python && pnpm test:python",
"test:data:download": "dam download test/data test/data.tar.gz bafkreiha6oye3fd5cxfadnua5r2jlkaco2xuyeek454d2ihiffsx7rauqe https://placeholder",
"test:data:pack": "dam pack test/data test/data.tar.gz",
"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",
"test:python:wasi": "pnpm test:data:download && pixi run --manifest-path=./pixi.toml test-wasi",
"test:python:emscripten": "pnpm test:data:download && pixi run --manifest-path=./pixi.toml test-emscripten",
"test:python:dispatch": "pnpm test:data:download && pixi run --manifest-path=./pixi.toml test-dispatch",
"test:python": "pixi run --manifest-path=./pixi.toml test-python",
"test:wasi": "itk-wasm pnpm-script test:wasi"
},
"license": "Apache-2.0",
Expand Down
10 changes: 8 additions & 2 deletions packages/compress-stringify/pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ name = "compress-stringify"
platforms = ["win-64", "linux-64", "linux-aarch64", "osx-arm64"]
version = "0.1.0"

[tasks]

[dependencies]
python = "3.12.*"
pnpm = ">=9.12.1,<10"
Expand All @@ -20,6 +18,14 @@ m2w64-jq = ">=1.6.0,<2"
[target.unix.dependencies]
jq = ">=1.7.1,<2"

[tasks.build]
cmd = "pnpm run build"
description = "Build the project"

[tasks.test]
cmd = "pnpm run test"
description = "Run tests"

[tasks.version-sync-typescript]
cmd = '''version=$(cat package.json | jq .version) &&
jq ".version = $version" typescript/package.json > typescript/package.json.tmp &&
Expand Down

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions packages/dicom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
"test": "pnpm test:data:download && pnpm build:gen:python && pnpm test:python",
"test:data:download": "dam download test/data test/data.tar.gz bafybeiaqmwshl3vrcp5soxvmsez4nfhugcv7p432k6ndmb3jecspnvvv6u https://data.kitware.com/api/v1/file/6706def5fb903c47575aa6cc/download",
"test:data:pack": "dam pack test/data test/data.tar.gz",
"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:wasi": "pnpm test:data:download && pixi run --manifest-path=./pixi.toml test-wasi",
"test:python:emscripten": "pnpm test:data:download && pixi run --manifest-path=./pixi.toml test-emscripten",
"test:python:dispatch": "pnpm test:data:download && pixi run --manifest-path=./pixi.toml test-dispatch",
"test:python": "itk-wasm pnpm-script test:python",
"test:wasi": "itk-wasm pnpm-script test:wasi"
},
Expand Down
10 changes: 8 additions & 2 deletions packages/dicom/pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ name = "dicom"
platforms = ["win-64", "linux-64", "linux-aarch64", "osx-arm64"]
version = "0.1.0"

[tasks]

[dependencies]
python = "3.12.*"
pnpm = ">=9.12.1,<10"
Expand All @@ -20,6 +18,14 @@ m2w64-jq = ">=1.6.0,<2"
[target.unix.dependencies]
jq = ">=1.7.1,<2"

[tasks.build]
cmd = "pnpm run build"
description = "Build the project"

[tasks.test]
cmd = "pnpm run test"
description = "Run tests"

[tasks.version-sync-typescript]
cmd = '''version=$(cat package.json | jq .version) &&
jq ".version = $version" typescript/package.json > typescript/package.json.tmp &&
Expand Down
6 changes: 3 additions & 3 deletions packages/downsample/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
"test": "pnpm test:data:download && pnpm build:gen:python && pnpm test:python",
"test:data:download": "dam download test/data test/data.tar.gz bafkreic7utwwa32sc7ekhouzdlnla4kffytphcwc7qwam5ndhixwjulydq https://github.com/InsightSoftwareConsortium/ITK-Wasm/releases/download/itk-wasm-v1.0.0-b.163/itkwasm-downsample-test-data.tar.gz https://w3s.link/ipfs/bafybeifwebok64osjl2i3zc6rkn3izgon333wsjotqzqlxorkkvrbldjcy/data.tar.gz",
"test:data:pack": "dam pack test/data test/data.tar.gz",
"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:wasi": "pnpm test:data:download && pixi run --manifest-path=./pixi.toml test-wasi",
"test:python:emscripten": "pnpm test:data:download && pixi run --manifest-path=./pixi.toml test-emscripten",
"test:python:dispatch": "pnpm test:data:download && pixi run --manifest-path=./pixi.toml test-dispatch",
"test:python": "itk-wasm pnpm-script test:python",
"test:wasi": "itk-wasm pnpm-script test:wasi -- -V"
},
Expand Down
10 changes: 8 additions & 2 deletions packages/downsample/pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ name = "downsample"
platforms = ["win-64", "linux-64", "linux-aarch64", "osx-arm64"]
version = "0.1.0"

[tasks]

[dependencies]
python = "3.12.*"
pnpm = ">=9.12.1,<10"
Expand All @@ -17,6 +15,14 @@ pip = ">=24.2,<25"
[target.win-64.dependencies]
m2w64-jq = ">=1.6.0,<2"

[tasks.build]
cmd = "pnpm run build"
description = "Build the project"

[tasks.test]
cmd = "pnpm run test"
description = "Run tests"

[target.unix.dependencies]
jq = ">=1.7.1,<2"

Expand Down
6 changes: 3 additions & 3 deletions packages/image-io/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
"test": "pnpm test:data:download && pnpm build:gen:python && pnpm test:python",
"test:data:download": "dam download test/data test/data.tar.gz bafybeibyjhkcrinl2lotw5g2vngjs23aaenv3tjzxssm35jxaci5ylsqia https://github.com/InsightSoftwareConsortium/ITK-Wasm/releases/download/itk-wasm-v1.0.0-b.155/image-io-test-data.tar.gz https://w3s.link/ipfs/bafybeiewe4rankwwe7nw7qm2g3qclflhci2e53wthn3gukdlhbff64pua4/data.tar.gz",
"test:data:pack": "dam pack test/data test/data.tar.gz",
"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:wasi": "pnpm test:data:download && pixi run --manifest-path=./pixi.toml test-wasi",
"test:python:emscripten": "pnpm test:data:download && pixi run --manifest-path=./pixi.toml test-emscripten",
"test:python:dispatch": "pnpm test:data:download && pixi run --manifest-path=./pixi.toml test-dispatch",
"test:python": "itk-wasm pnpm-script test:python",
"test:wasi": "itk-wasm pnpm-script test:wasi"
},
Expand Down
10 changes: 8 additions & 2 deletions packages/image-io/pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ name = "image-io"
platforms = ["win-64", "linux-64", "linux-aarch64", "osx-arm64"]
version = "0.1.0"

[tasks]

[dependencies]
python = "3.12.*"
pnpm = ">=9.12.1,<10"
Expand All @@ -20,6 +18,14 @@ m2w64-jq = ">=1.6.0,<2"
[target.unix.dependencies]
jq = ">=1.7.1,<2"

[tasks.build]
cmd = "pnpm run build"
description = "Build the project"

[tasks.test]
cmd = "pnpm run test"
description = "Run tests"

[tasks.version-sync-typescript]
cmd = '''version=$(cat package.json | jq .version) &&
jq ".version = $version" typescript/package.json > typescript/package.json.tmp &&
Expand Down
6 changes: 3 additions & 3 deletions packages/mesh-io/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
"test": "pnpm test:data:download && pnpm build:gen:python && pnpm test:python",
"test:data:download": "dam download test/data test/data.tar.gz bafkreiahocrgb3p4xrjozr7cg5wdpdt6wp77kolnqyupae6awkplb5p4he https://bafybeian677gvnngces3pbcv6zpzauf3yn5bedxdis4smwzwh5xeewazuq.ipfs.w3s.link/ipfs/bafybeian677gvnngces3pbcv6zpzauf3yn5bedxdis4smwzwh5xeewazuq/data.tar.gz",
"test:data:pack": "dam pack test/data test/data.tar.gz",
"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:wasi": "pnpm test:data:download && pixi run --manifest-path=./pixi.toml test-wasi",
"test:python:emscripten": "pnpm test:data:download && pixi run --manifest-path=./pixi.toml test-emscripten",
"test:python:dispatch": "pnpm test:data:download && pixi run --manifest-path=./pixi.toml test-dispatch",
"test:python": "itk-wasm pnpm-script test:python",
"test:wasi": "itk-wasm pnpm-script test:wasi"
},
Expand Down
10 changes: 8 additions & 2 deletions packages/mesh-io/pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,20 @@ name = "mesh-io"
platforms = ["win-64", "linux-64", "linux-aarch64", "osx-arm64"]
version = "0.1.0"

[tasks]

[dependencies]
python = "3.12.*"
pnpm = ">=9.12.1,<10"
hatch = ">=1.13.0,<2"
pip = ">=24.2,<25"

[tasks.build]
cmd = "pnpm run build"
description = "Build the project"

[tasks.test]
cmd = "pnpm run test"
description = "Run tests"

[target.win-64.dependencies]
m2w64-jq = ">=1.6.0,<2"

Expand Down
2 changes: 1 addition & 1 deletion packages/transform-io/.gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
test/
emscripten-build/
python/
wasi-build/
typescript/dist
typescript/src/version.ts
pyodide/
11 changes: 7 additions & 4 deletions packages/transform-io/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
"description": "scripts to generate @itk-wasm/transform-io itk-wasm artifacts.",
"type": "module",
"itk-wasm": {
"test-data-hash": "bafkreiahocrgb3p4xrjozr7cg5wdpdt6wp77kolnqyupae6awkplb5p4he",
"test-data-urls": [
"https://bafybeian677gvnngces3pbcv6zpzauf3yn5bedxdis4smwzwh5xeewazuq.ipfs.w3s.link/ipfs/bafybeian677gvnngces3pbcv6zpzauf3yn5bedxdis4smwzwh5xeewazuq/data.tar.gz"
],
"emscripten-docker-image": "itkwasm/emscripten:latest",
"wasi-docker-image": "itkwasm/wasi:latest",
"typescript-package-name": "@itk-wasm/transform-io",
Expand All @@ -23,13 +27,12 @@
"bindgen:python": "itk-wasm pnpm-script bindgen:python",
"build:gen:typescript": "itk-wasm pnpm-script build:gen:typescript",
"build:gen:python": "pnpm build:wasi && pnpm bindgen:python",
"publish:python": "itk-wasm pnpm-script publish:python",
"test": "pnpm test:data:download && pnpm build:gen:python && pnpm test:python",
"test:data:download": "dam download test/data test/data.tar.gz bafkreihranpzszz3q5bwgzsw6olqwh2e726wfnh4qblkjbng44yhqbfin4 https://bafybeihn3n52vhja45ds3d4wsch3i77rej2oylorjgevt55w3aqirgxzme.ipfs.w3s.link/ipfs/bafybeihn3n52vhja45ds3d4wsch3i77rej2oylorjgevt55w3aqirgxzme/data.tar.gz",
"test:data:pack": "dam pack test/data test/data.tar.gz",
"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:wasi": "pnpm test:data:download && pixi run --manifest-path=./pixi.toml test-wasi",
"test:python:emscripten": "pnpm test:data:download && pixi run --manifest-path=./pixi.toml test-emscripten",
"test:python:dispatch": "pnpm test:data:download && pixi run --manifest-path=./pixi.toml test-dispatch",
"test:python": "itk-wasm pnpm-script test:python",
"test:wasi": "itk-wasm pnpm-script test:wasi"
},
Expand Down
Loading

0 comments on commit ec64423

Please sign in to comment.