From 23b405d37b882e85546ca7ac0eb7c783c622a323 Mon Sep 17 00:00:00 2001 From: Nicolas Girardot Date: Fri, 7 Feb 2025 08:36:03 +0100 Subject: [PATCH 1/4] feat: use edgee-component toml to build --- Makefile | 6 +++--- README.md | 1 + edgee-component.toml | 11 +++++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 edgee-component.toml diff --git a/Makefile b/Makefile index e67dccb..0e6d454 100644 --- a/Makefile +++ b/Makefile @@ -16,9 +16,9 @@ edgee_world: setup: edgee_world ## setup development environment -build: setup ## build component - uv run componentize-py --wit-path wit/ --world data-collection componentize dc_component -o dc_component.wasm - +build: + edgee components build + clean: ## clean build artifacts rm -rf dc_component.wasm rm -rf edgee_world diff --git a/README.md b/README.md index fd1dbc2..aebc094 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ This is an example of a Python Edgee Component. ## Setup Requirements: +- [edgee-cli] (https://github.com/edgee-cloud/edgee) - Python3 - uv diff --git a/edgee-component.toml b/edgee-component.toml new file mode 100644 index 0000000..27d6c4f --- /dev/null +++ b/edgee-component.toml @@ -0,0 +1,11 @@ +manifest_version = 1 + +[package] +name = "example-py-component" +version = "1.0.0" + +wit-world-version = "0.3.0" + +[package.build] +command = "uv sync && uv run componentize-py --wit-path wit/ bindings edgee_world && uv run componentize-py --wit-path wit/ --world data-collection componentize dc_component -o dc_component.wasm" +output_path = "./dc-component.wasm" From 22289dc7afcaec1d3ffcde3403cebd6f05fa6654 Mon Sep 17 00:00:00 2001 From: Nicolas Girardot Date: Fri, 7 Feb 2025 09:05:23 +0100 Subject: [PATCH 2/4] feat: add no edgee build for ci --- .github/workflows/check.yml | 47 ++++++++++++++++++------------------- Makefile | 3 +++ 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index ffd827a..921128b 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -1,32 +1,31 @@ name: Check on: - push: - branches: - - main - pull_request: + push: + branches: + - main + pull_request: jobs: - test: - name: test - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 + test: + name: test + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 - - name: Install uv - uses: astral-sh/setup-uv@v5 + - name: Install uv + uses: astral-sh/setup-uv@v5 - - name: "Set up Python" - uses: actions/setup-python@v5 - with: - python-version-file: "pyproject.toml" + - name: "Set up Python" + uses: actions/setup-python@v5 + with: + python-version-file: "pyproject.toml" - - name: Build component - run: | - make setup - make build - - - name: Test component - run: | - make test + - name: Build component + run: | + make setup + make build-no-edgee + - name: Test component + run: | + make test diff --git a/Makefile b/Makefile index 0e6d454..1f565ef 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,9 @@ setup: edgee_world ## setup development environment build: edgee components build + +build-no-edgee: setup ## build component + uv run componentize-py --wit-path wit/ --world data-collection componentize dc_component -o dc_component.wasm clean: ## clean build artifacts rm -rf dc_component.wasm From 2486a26ea3c620908325a061950ef0cbac9e66e1 Mon Sep 17 00:00:00 2001 From: Nicolas Girardot Date: Mon, 10 Feb 2025 09:09:09 +0100 Subject: [PATCH 3/4] feat: update wit version --- edgee-component.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edgee-component.toml b/edgee-component.toml index 27d6c4f..90eeb8b 100644 --- a/edgee-component.toml +++ b/edgee-component.toml @@ -4,7 +4,7 @@ manifest_version = 1 name = "example-py-component" version = "1.0.0" -wit-world-version = "0.3.0" +wit-world-version = "0.4.0" [package.build] command = "uv sync && uv run componentize-py --wit-path wit/ bindings edgee_world && uv run componentize-py --wit-path wit/ --world data-collection componentize dc_component -o dc_component.wasm" From 4d347548cee151b3cc2ef8f300a8a66685334929 Mon Sep 17 00:00:00 2001 From: Nicolas Girardot Date: Mon, 10 Feb 2025 10:42:52 +0100 Subject: [PATCH 4/4] feat(): update toml for new format --- edgee-component.toml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/edgee-component.toml b/edgee-component.toml index 90eeb8b..919eb73 100644 --- a/edgee-component.toml +++ b/edgee-component.toml @@ -3,7 +3,11 @@ manifest_version = 1 [package] name = "example-py-component" version = "1.0.0" - +category = "data-collection" +subcategory = "analytics" +description = "Example Python component for data collection" +documentation = "https://github.com/edgee-cloud/example-py-component" +repository = "https://github.com/edgee-cloud/example-py-component" wit-world-version = "0.4.0" [package.build]