From 458d78e7a93d414afc8d45bce97e09e7b8e20e75 Mon Sep 17 00:00:00 2001 From: haixuantao Date: Wed, 11 Dec 2024 18:12:41 +0000 Subject: [PATCH 01/17] Use UV for the CI/CD for faster dependency resolution --- .github/workflows/node-hub-ci-cd.yml | 6 ++++-- .github/workflows/node_hub_test.sh | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/node-hub-ci-cd.yml b/.github/workflows/node-hub-ci-cd.yml index 02977d7b2..591d4877b 100644 --- a/.github/workflows/node-hub-ci-cd.yml +++ b/.github/workflows/node-hub-ci-cd.yml @@ -81,12 +81,13 @@ jobs: with: python-version: "3.10" - - name: Set up Poetry + - name: Set up UV and poetry if: runner.os == 'Linux' || github.event_name == 'workflow_dispatch' || (github.event_name == 'release' && startsWith(github.ref, 'refs/tags/')) run: | curl -sSL https://install.python-poetry.org | python3 - + curl -LsSf https://astral.sh/uv/install.sh | sh echo "$HOME/.local/bin" >> $GITHUB_PATH - pip install ruff pytest + uv pip install ruff pytest - name: Set up Rust if: runner.os == 'Linux' || github.event_name == 'workflow_dispatch' || (github.event_name == 'release' && startsWith(github.ref, 'refs/tags/')) @@ -99,6 +100,7 @@ jobs: ## Run Linting and testing only on Mac for release workflows. if: runner.os == 'Linux' || github.event_name == 'workflow_dispatch' || (github.event_name == 'release' && startsWith(github.ref, 'refs/tags/')) run: | + alias pip="uv pip" chmod +x ../../.github/workflows/node_hub_test.sh ../../.github/workflows/node_hub_test.sh diff --git a/.github/workflows/node_hub_test.sh b/.github/workflows/node_hub_test.sh index fa083fdc7..719059964 100755 --- a/.github/workflows/node_hub_test.sh +++ b/.github/workflows/node_hub_test.sh @@ -44,7 +44,7 @@ else echo "Running linting and tests for Python project in $dir..." pip install . ruff check . - poetry run pytest + pytest fi fi fi From 6f2656eb490dff7cd15546ee5f52e2633f720a92 Mon Sep 17 00:00:00 2001 From: haixuantao Date: Wed, 15 Jan 2025 16:36:34 +0100 Subject: [PATCH 02/17] Replace poetry with uv in CI/CD --- .github/workflows/node-hub-ci-cd.yml | 19 +++++++++---------- .github/workflows/node_hub_test.sh | 4 ++-- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/node-hub-ci-cd.yml b/.github/workflows/node-hub-ci-cd.yml index 591d4877b..c4d9d8ee7 100644 --- a/.github/workflows/node-hub-ci-cd.yml +++ b/.github/workflows/node-hub-ci-cd.yml @@ -81,10 +81,9 @@ jobs: with: python-version: "3.10" - - name: Set up UV and poetry + - name: Set up UV if: runner.os == 'Linux' || github.event_name == 'workflow_dispatch' || (github.event_name == 'release' && startsWith(github.ref, 'refs/tags/')) run: | - curl -sSL https://install.python-poetry.org | python3 - curl -LsSf https://astral.sh/uv/install.sh | sh echo "$HOME/.local/bin" >> $GITHUB_PATH uv pip install ruff pytest @@ -100,7 +99,6 @@ jobs: ## Run Linting and testing only on Mac for release workflows. if: runner.os == 'Linux' || github.event_name == 'workflow_dispatch' || (github.event_name == 'release' && startsWith(github.ref, 'refs/tags/')) run: | - alias pip="uv pip" chmod +x ../../.github/workflows/node_hub_test.sh ../../.github/workflows/node_hub_test.sh @@ -141,9 +139,9 @@ jobs: with: python-version: "3.10" - - name: Set up Poetry + - name: Set up UV run: | - curl -sSL https://install.python-poetry.org | python3 - + curl -LsSf https://astral.sh/uv/install.sh | sh echo "$HOME/.local/bin" >> $GITHUB_PATH - name: Set up Rust @@ -154,7 +152,7 @@ jobs: - name: Publish Projects env: MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_PASS }} - POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_PASS }} + UV_PUBLISH_TOKEN: ${{ secrets.PYPI_PASS }} CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} run: | dir=$(pwd) @@ -167,7 +165,7 @@ jobs: if [[ -f "Cargo.toml" && -f "pyproject.toml" ]]; then echo "Publishing $dir using maturin..." if [[ "${{ runner.os }}" == "Linux" ]]; then - pip3 install "maturin[zig]" + uv pip install "maturin[zig]" ## The CI/CD is sequential to limit the number of workers used. @@ -183,13 +181,14 @@ jobs: maturin publish --target armv7-unknown-linux-musleabihf --zig --skip-existing else - pip3 install maturin + uv pip install maturin maturin publish --skip-existing fi else if [ -f "pyproject.toml" ]; then - echo "Publishing $dir using Poetry..." - poetry publish --build --skip-existing + echo "Publishing $dir using UV..." + uv build + uv publish fi if [ -f "Cargo.toml" ]; then diff --git a/.github/workflows/node_hub_test.sh b/.github/workflows/node_hub_test.sh index 719059964..ae7e119d1 100755 --- a/.github/workflows/node_hub_test.sh +++ b/.github/workflows/node_hub_test.sh @@ -22,7 +22,7 @@ else cargo build cargo test - pip3 install "maturin[zig]" + uv pip install "maturin[zig]" maturin build --zig # aarch64-unknown-linux-gnu @@ -42,7 +42,7 @@ else else if [ -f "$dir/pyproject.toml" ]; then echo "Running linting and tests for Python project in $dir..." - pip install . + uv pip install . ruff check . pytest fi From a059f71e22561d22d418e2b0c0b5a05436fdb4cd Mon Sep 17 00:00:00 2001 From: haixuantao Date: Thu, 16 Jan 2025 22:07:34 +0100 Subject: [PATCH 03/17] Fix CI/CD by allowing maturing to be installed with pip --- .github/workflows/node-hub-ci-cd.yml | 4 ++-- .github/workflows/node_hub_test.sh | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/node-hub-ci-cd.yml b/.github/workflows/node-hub-ci-cd.yml index c4d9d8ee7..2eb6b41ba 100644 --- a/.github/workflows/node-hub-ci-cd.yml +++ b/.github/workflows/node-hub-ci-cd.yml @@ -165,7 +165,7 @@ jobs: if [[ -f "Cargo.toml" && -f "pyproject.toml" ]]; then echo "Publishing $dir using maturin..." if [[ "${{ runner.os }}" == "Linux" ]]; then - uv pip install "maturin[zig]" + pip install "maturin[zig]" ## The CI/CD is sequential to limit the number of workers used. @@ -181,7 +181,7 @@ jobs: maturin publish --target armv7-unknown-linux-musleabihf --zig --skip-existing else - uv pip install maturin + pip install maturin maturin publish --skip-existing fi else diff --git a/.github/workflows/node_hub_test.sh b/.github/workflows/node_hub_test.sh index ae7e119d1..dbeb478bf 100755 --- a/.github/workflows/node_hub_test.sh +++ b/.github/workflows/node_hub_test.sh @@ -22,7 +22,7 @@ else cargo build cargo test - uv pip install "maturin[zig]" + pip install "maturin[zig]" maturin build --zig # aarch64-unknown-linux-gnu @@ -42,9 +42,10 @@ else else if [ -f "$dir/pyproject.toml" ]; then echo "Running linting and tests for Python project in $dir..." + uv venv uv pip install . - ruff check . - pytest + uv run ruff check . + uv run pytest fi fi fi From a8a9488ec7f019c4055dcc78642a8c28077b1709 Mon Sep 17 00:00:00 2001 From: haixuantao Date: Fri, 17 Jan 2025 10:33:39 +0100 Subject: [PATCH 04/17] Fix project table to conform to official pyproject toml --- node-hub/dora-argotranslate/pyproject.toml | 9 +++++---- node-hub/dora-distil-whisper/pyproject.toml | 10 +++++----- node-hub/dora-echo/pyproject.toml | 10 ++++------ node-hub/dora-internvl/pyproject.toml | 7 ++++--- node-hub/dora-keyboard/pyproject.toml | 10 ++++------ node-hub/dora-microphone/pyproject.toml | 10 ++++------ node-hub/dora-openai-server/pyproject.toml | 10 ++++------ node-hub/dora-opus/pyproject.toml | 10 ++++++---- node-hub/dora-outtetts/pyproject.toml | 2 -- node-hub/dora-parler/pyproject.toml | 7 ++++--- node-hub/dora-piper/pyproject.toml | 5 +++-- node-hub/dora-pyaudio/pyproject.toml | 9 ++++----- node-hub/dora-pyorbbecksdk/pyproject.toml | 7 ++++--- node-hub/dora-pyrealsense/pyproject.toml | 5 +++-- node-hub/dora-qwenvl/pyproject.toml | 7 ++++--- node-hub/dora-rdt-1b/pyproject.toml | 5 +++-- node-hub/dora-ugv/pyproject.toml | 5 +++-- node-hub/dora-yolo/pyproject.toml | 7 ++++--- node-hub/llama-factory-recorder/pyproject.toml | 7 ++++--- node-hub/opencv-plot/pyproject.toml | 7 ++++--- node-hub/opencv-video-capture/pyproject.toml | 7 ++++--- node-hub/pyarrow-assert/pyproject.toml | 11 +++++------ node-hub/pyarrow-sender/pyproject.toml | 10 +++++----- node-hub/terminal-input/pyproject.toml | 10 +++++----- 24 files changed, 95 insertions(+), 92 deletions(-) diff --git a/node-hub/dora-argotranslate/pyproject.toml b/node-hub/dora-argotranslate/pyproject.toml index 7a4cfb909..1deaec1c1 100644 --- a/node-hub/dora-argotranslate/pyproject.toml +++ b/node-hub/dora-argotranslate/pyproject.toml @@ -1,14 +1,15 @@ -[tool.poetry] +[project] name = "dora-argotranslate" version = "0.3.8" description = "Dora Node for Text translating using Argostranslate" readme = "README.md" authors = [ - "Haixuan Xavier Tao ", - "Enzo Le Van ", - "Félix Huang ", + { name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }, + { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, + { name = "Félix Huang", email = "felix.huang.net@gmail.com" }, ] +[tool.poetry] packages = [{ include = "dora_argotranslate" }] [tool.poetry.dependencies] diff --git a/node-hub/dora-distil-whisper/pyproject.toml b/node-hub/dora-distil-whisper/pyproject.toml index c170c5b72..6544e8a1e 100644 --- a/node-hub/dora-distil-whisper/pyproject.toml +++ b/node-hub/dora-distil-whisper/pyproject.toml @@ -1,15 +1,15 @@ -[tool.poetry] +[project] name = "dora-distil-whisper" version = "0.3.8" authors = [ - "Haixuan Xavier Tao ", - "Enzo Le Van ", + { name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }, + { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora dora-distil-whisper" license = "MIT License" -homepage = "https://github.com/dora-rs/dora.git" -documentation = "https://github.com/dora-rs/dora/blob/main/node-hub/dora-distil-whisper/README.md" readme = "README.md" + +[tool.poetry] packages = [{ include = "dora_distil_whisper" }] [tool.poetry.dependencies] diff --git a/node-hub/dora-echo/pyproject.toml b/node-hub/dora-echo/pyproject.toml index e7a169c2c..e72d3ed13 100644 --- a/node-hub/dora-echo/pyproject.toml +++ b/node-hub/dora-echo/pyproject.toml @@ -1,15 +1,13 @@ -[tool.poetry] +[project] name = "dora-echo" version = "0.3.8" authors = [ - "Haixuan Xavier Tao ", - "Enzo Le Van ", + { name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }, + { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora echo" license = "MIT License" -homepage = "https://github.com/dora-rs/dora.git" -documentation = "https://github.com/dora-rs/dora/blob/main/node-hub/dora-echo/README.md" -readme = "README.md" +[tool.poetry] packages = [{ include = "dora_echo" }] [tool.poetry.dependencies] diff --git a/node-hub/dora-internvl/pyproject.toml b/node-hub/dora-internvl/pyproject.toml index d8cdb1667..19fadd974 100644 --- a/node-hub/dora-internvl/pyproject.toml +++ b/node-hub/dora-internvl/pyproject.toml @@ -1,13 +1,14 @@ -[tool.poetry] +[project] name = "dora-internvl" version = "0.3.8" authors = [ - "Haixuan Xavier Tao ", - "Enzo Le Van ", + { name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }, + { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora Node for VLM" readme = "README.md" +[tool.poetry] packages = [{ include = "dora_internvl" }] [tool.poetry.dependencies] diff --git a/node-hub/dora-keyboard/pyproject.toml b/node-hub/dora-keyboard/pyproject.toml index ecf508e8a..a3a0bacee 100644 --- a/node-hub/dora-keyboard/pyproject.toml +++ b/node-hub/dora-keyboard/pyproject.toml @@ -1,15 +1,13 @@ -[tool.poetry] +[project] name = "dora-keyboard" version = "0.3.8" authors = [ - "Haixuan Xavier Tao ", - "Enzo Le Van ", + { name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }, + { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora dora-keyboard" license = "MIT License" -homepage = "https://github.com/dora-rs/dora.git" -documentation = "https://github.com/dora-rs/dora/blob/main/node-hub/dora-keyboard/README.md" -readme = "README.md" +[tool.poetry] packages = [{ include = "dora_keyboard" }] [tool.poetry.dependencies] diff --git a/node-hub/dora-microphone/pyproject.toml b/node-hub/dora-microphone/pyproject.toml index c5b67246e..fc4e53769 100644 --- a/node-hub/dora-microphone/pyproject.toml +++ b/node-hub/dora-microphone/pyproject.toml @@ -1,15 +1,13 @@ -[tool.poetry] +[project] name = "dora-microphone" version = "0.3.8" authors = [ - "Haixuan Xavier Tao ", - "Enzo Le Van ", + { name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }, + { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora dora-microphone" license = "MIT License" -homepage = "https://github.com/dora-rs/dora.git" -documentation = "https://github.com/dora-rs/dora/blob/main/node-hub/dora-microphone/README.md" -readme = "README.md" +[tool.poetry] packages = [{ include = "dora_microphone" }] [tool.poetry.dependencies] diff --git a/node-hub/dora-openai-server/pyproject.toml b/node-hub/dora-openai-server/pyproject.toml index 0decc0371..c031037a3 100644 --- a/node-hub/dora-openai-server/pyproject.toml +++ b/node-hub/dora-openai-server/pyproject.toml @@ -1,15 +1,13 @@ -[tool.poetry] +[project] name = "dora-openai-server" version = "0.3.8" authors = [ - "Haixuan Xavier Tao ", - "Enzo Le Van ", + { name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }, + { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora OpenAI API Server" license = "MIT License" -homepage = "https://github.com/dora-rs/dora.git" -documentation = "https://github.com/dora-rs/dora/blob/main/node-hub/dora-openai-server/README.md" -readme = "README.md" +[tool.poetry] packages = [{ include = "dora_openai_server" }] [tool.poetry.dependencies] diff --git a/node-hub/dora-opus/pyproject.toml b/node-hub/dora-opus/pyproject.toml index 89d627d1e..e02847199 100644 --- a/node-hub/dora-opus/pyproject.toml +++ b/node-hub/dora-opus/pyproject.toml @@ -1,14 +1,16 @@ -[tool.poetry] +[project] name = "dora-opus" version = "0.3.8" description = "Dora Node for Text translating using Opus" readme = "README.md" authors = [ - "Haixuan Xavier Tao ", - "Enzo Le Van ", - "Félix Huang ", + { name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }, + { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, + { name = "Félix Huang", email = "felix.huang.net@gmail.com" }, ] + +[tool.poetry] packages = [{ include = "dora_opus" }] [tool.poetry.dependencies] diff --git a/node-hub/dora-outtetts/pyproject.toml b/node-hub/dora-outtetts/pyproject.toml index 4b299a6b0..969d7076e 100644 --- a/node-hub/dora-outtetts/pyproject.toml +++ b/node-hub/dora-outtetts/pyproject.toml @@ -8,8 +8,6 @@ readme = "README.md" requires-python = ">=3.10" [tool.poetry] -homepage = "https://github.com/dora-rs/dora.git" -documentation = "https://github.com/dora-rs/dora/blob/main/node-hub/dora-outtetts/README.md" packages = [{ include = "dora_outtetts" }] [tool.poetry.dependencies] diff --git a/node-hub/dora-parler/pyproject.toml b/node-hub/dora-parler/pyproject.toml index 5433eba45..633096405 100644 --- a/node-hub/dora-parler/pyproject.toml +++ b/node-hub/dora-parler/pyproject.toml @@ -1,13 +1,14 @@ -[tool.poetry] +[project] name = "dora-parler" version = "0.3.8" authors = [ - "Haixuan Xavier Tao ", - "Enzo Le Van ", + { name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }, + { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora Node for Text to speech with dora Parler-TTS" readme = "README.md" +[tool.poetry] packages = [{ include = "dora_parler" }] [tool.poetry.dependencies] diff --git a/node-hub/dora-piper/pyproject.toml b/node-hub/dora-piper/pyproject.toml index d5c1009e4..cddc3221f 100644 --- a/node-hub/dora-piper/pyproject.toml +++ b/node-hub/dora-piper/pyproject.toml @@ -1,10 +1,11 @@ -[tool.poetry] +[project] name = "dora-piper" version = "0.3.8" -authors = ["Haixuan Xavier Tao "] +authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] description = "Dora Node for using Agilex piper" readme = "README.md" +[tool.poetry] packages = [{ include = "dora_piper" }] [tool.poetry.dependencies] diff --git a/node-hub/dora-pyaudio/pyproject.toml b/node-hub/dora-pyaudio/pyproject.toml index 261c18fd4..c1ff8824f 100644 --- a/node-hub/dora-pyaudio/pyproject.toml +++ b/node-hub/dora-pyaudio/pyproject.toml @@ -1,12 +1,11 @@ -[tool.poetry] +[project] name = "dora-pyaudio" version = "0.0.0" -authors = ["author"] +authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] description = "dora-pyaudio" license = "MIT License" -homepage = "https://github.com/dora-rs/dora.git" -documentation = "https://github.com/dora-rs/dora/blob/main/node-hub/dora-pyaudio/README.md" -readme = "README.md" + +[tool.poetry] packages = [{ include = "dora_pyaudio" }] [tool.poetry.dependencies] diff --git a/node-hub/dora-pyorbbecksdk/pyproject.toml b/node-hub/dora-pyorbbecksdk/pyproject.toml index 2755a2deb..357b0b374 100644 --- a/node-hub/dora-pyorbbecksdk/pyproject.toml +++ b/node-hub/dora-pyorbbecksdk/pyproject.toml @@ -1,13 +1,14 @@ -[tool.poetry] +[project] name = "dora-pyorbbecksdk" version = "0.3.8" authors = [ - "Haixuan Xavier Tao ", - "Xiang Yang ", + { name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }, + { name = "Xiang Yang", email = "Ryu-Yang@qq.com" }, ] description = "Dora Node for capturing video with PyOrbbeck SDK" readme = "README.md" +[tool.poetry] packages = [{ include = "dora_pyorbbecksdk" }] [tool.poetry.dependencies] diff --git a/node-hub/dora-pyrealsense/pyproject.toml b/node-hub/dora-pyrealsense/pyproject.toml index d6663c958..5ff42b402 100644 --- a/node-hub/dora-pyrealsense/pyproject.toml +++ b/node-hub/dora-pyrealsense/pyproject.toml @@ -1,10 +1,11 @@ -[tool.poetry] +[project] name = "dora-pyrealsense" version = "0.3.8" -authors = ["Haixuan Xavier Tao "] +authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] description = "Dora Node for capturing video with Pyrealsense" readme = "README.md" +[tool.poetry] packages = [{ include = "dora_pyrealsense" }] [tool.poetry.dependencies] diff --git a/node-hub/dora-qwenvl/pyproject.toml b/node-hub/dora-qwenvl/pyproject.toml index 346c5f9f3..b6881d539 100644 --- a/node-hub/dora-qwenvl/pyproject.toml +++ b/node-hub/dora-qwenvl/pyproject.toml @@ -1,13 +1,14 @@ -[tool.poetry] +[project] name = "dora-qwenvl" version = "0.3.8" authors = [ - "Haixuan Xavier Tao ", - "Enzo Le Van ", + { name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }, + { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora Node for VLM" readme = "README.md" +[tool.poetry] packages = [{ include = "dora_qwenvl" }] [tool.poetry.dependencies] diff --git a/node-hub/dora-rdt-1b/pyproject.toml b/node-hub/dora-rdt-1b/pyproject.toml index c75657bdd..81573cb6c 100644 --- a/node-hub/dora-rdt-1b/pyproject.toml +++ b/node-hub/dora-rdt-1b/pyproject.toml @@ -1,10 +1,11 @@ -[tool.poetry] +[project] name = "dora-rdt-1b" version = "0.3.8" -authors = ["Haixuan Xavier Tao "] +authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] description = "Dora Node for RDT 1B" readme = "README.md" +[tool.poetry] packages = [{ include = "dora_rdt_1b" }] [tool.poetry.dependencies] diff --git a/node-hub/dora-ugv/pyproject.toml b/node-hub/dora-ugv/pyproject.toml index dd1ed7ff7..dae5028ab 100644 --- a/node-hub/dora-ugv/pyproject.toml +++ b/node-hub/dora-ugv/pyproject.toml @@ -1,10 +1,11 @@ -[tool.poetry] +[project] name = "dora-ugv" version = "0.3.6" -authors = ["Haixuan Xavier Tao "] +authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] description = "Dora Node for using Agilex UGV" readme = "README.md" +[tool.poetry] packages = [{ include = "dora_ugv" }] [tool.poetry.dependencies] diff --git a/node-hub/dora-yolo/pyproject.toml b/node-hub/dora-yolo/pyproject.toml index 2f4a6ac86..3878e6883 100644 --- a/node-hub/dora-yolo/pyproject.toml +++ b/node-hub/dora-yolo/pyproject.toml @@ -1,13 +1,14 @@ -[tool.poetry] +[project] name = "dora-yolo" version = "0.3.8" authors = [ - "Haixuan Xavier Tao ", - "Enzo Le Van ", + { name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }, + { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora Node for object detection with dora YOLOv8" readme = "README.md" +[tool.poetry] packages = [{ include = "dora_yolo" }] [tool.poetry.dependencies] diff --git a/node-hub/llama-factory-recorder/pyproject.toml b/node-hub/llama-factory-recorder/pyproject.toml index 1a3d153f3..beea2bd01 100644 --- a/node-hub/llama-factory-recorder/pyproject.toml +++ b/node-hub/llama-factory-recorder/pyproject.toml @@ -1,13 +1,14 @@ -[tool.poetry] +[project] name = "llama-factory-recorder" version = "0.3.8" authors = [ - "Haixuan Xavier Tao ", - "Enzo Le Van ", + { name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }, + { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora Node for VLM" readme = "README.md" +[tool.poetry] packages = [{ include = "llama_factory_recorder" }] [tool.poetry.dependencies] diff --git a/node-hub/opencv-plot/pyproject.toml b/node-hub/opencv-plot/pyproject.toml index ccd00c03e..c6ca44d34 100644 --- a/node-hub/opencv-plot/pyproject.toml +++ b/node-hub/opencv-plot/pyproject.toml @@ -1,13 +1,14 @@ -[tool.poetry] +[project] name = "opencv-plot" version = "0.3.8" authors = [ - "Haixuan Xavier Tao ", - "Enzo Le Van ", + { name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }, + { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora Node for plotting text and bbox on image with OpenCV" readme = "README.md" +[tool.poetry] packages = [{ include = "opencv_plot" }] [tool.poetry.dependencies] diff --git a/node-hub/opencv-video-capture/pyproject.toml b/node-hub/opencv-video-capture/pyproject.toml index c75fac7b5..c0c077bd7 100644 --- a/node-hub/opencv-video-capture/pyproject.toml +++ b/node-hub/opencv-video-capture/pyproject.toml @@ -1,13 +1,14 @@ -[tool.poetry] +[project] name = "opencv-video-capture" version = "0.3.8" authors = [ - "Haixuan Xavier Tao ", - "Enzo Le Van ", + { name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }, + { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora Node for capturing video with OpenCV" readme = "README.md" +[tool.poetry] packages = [{ include = "opencv_video_capture" }] [tool.poetry.dependencies] diff --git a/node-hub/pyarrow-assert/pyproject.toml b/node-hub/pyarrow-assert/pyproject.toml index 24b8a4520..47abfebec 100644 --- a/node-hub/pyarrow-assert/pyproject.toml +++ b/node-hub/pyarrow-assert/pyproject.toml @@ -1,15 +1,14 @@ -[tool.poetry] +[project] +readme = "README.md" name = "pyarrow-assert" version = "0.3.8" authors = [ - "Haixuan Xavier Tao ", - "Enzo Le Van ", + { name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }, + { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora Node for plotting text and bbox on image with OpenCV" license = "MIT License" -homepage = "https://github.com/dora-rs/dora.git" -documentation = "https://github.com/dora-rs/dora/blob/main/node-hub/pyarrow-assert/README.md" -readme = "README.md" +[tool.poetry] packages = [{ include = "pyarrow_assert" }] [tool.poetry.dependencies] diff --git a/node-hub/pyarrow-sender/pyproject.toml b/node-hub/pyarrow-sender/pyproject.toml index dd51c86a0..878989950 100644 --- a/node-hub/pyarrow-sender/pyproject.toml +++ b/node-hub/pyarrow-sender/pyproject.toml @@ -1,15 +1,15 @@ -[tool.poetry] +[project] name = "pyarrow-sender" version = "0.3.8" authors = [ - "Haixuan Xavier Tao ", - "Enzo Le Van ", + { name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }, + { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora pyarrow Sender" license = "MIT License" -homepage = "https://github.com/dora-rs/dora.git" -documentation = "https://github.com/dora-rs/dora/blob/main/node-hub/pyarrow-sender/README.md" + readme = "README.md" +[tool.poetry] packages = [{ include = "pyarrow_sender" }] [tool.poetry.dependencies] diff --git a/node-hub/terminal-input/pyproject.toml b/node-hub/terminal-input/pyproject.toml index 25dbd268f..63bf1ba84 100644 --- a/node-hub/terminal-input/pyproject.toml +++ b/node-hub/terminal-input/pyproject.toml @@ -1,15 +1,15 @@ -[tool.poetry] +[project] name = "terminal-input" version = "0.3.8" authors = [ - "Haixuan Xavier Tao ", - "Enzo Le Van ", + { name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }, + { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora terminal input" license = "MIT License" -homepage = "https://github.com/dora-rs/dora.git" -documentation = "https://github.com/dora-rs/dora/blob/main/node-hub/terminal-input/README.md" readme = "README.md" + +[tool.poetry] packages = [{ include = "terminal_input" }] [tool.poetry.dependencies] From 4325d260dc7d911ff54da99ddc5f265f75ddf3a0 Mon Sep 17 00:00:00 2001 From: haixuantao Date: Fri, 17 Jan 2025 10:44:17 +0100 Subject: [PATCH 05/17] use generic `project.scripts` instead of `tool.poetry.scripts` --- .../src/template/python/__node-name__/pyproject.toml | 10 +++++----- node-hub/dora-argotranslate/pyproject.toml | 2 +- node-hub/dora-distil-whisper/pyproject.toml | 2 +- node-hub/dora-echo/pyproject.toml | 2 +- node-hub/dora-internvl/pyproject.toml | 2 +- node-hub/dora-keyboard/pyproject.toml | 2 +- node-hub/dora-microphone/pyproject.toml | 2 +- node-hub/dora-openai-server/pyproject.toml | 2 +- node-hub/dora-opus/pyproject.toml | 2 +- node-hub/dora-outtetts/pyproject.toml | 2 +- node-hub/dora-parler/pyproject.toml | 2 +- node-hub/dora-piper/pyproject.toml | 2 +- node-hub/dora-pyaudio/pyproject.toml | 2 +- node-hub/dora-pyorbbecksdk/pyproject.toml | 2 +- node-hub/dora-pyrealsense/pyproject.toml | 2 +- node-hub/dora-qwenvl/pyproject.toml | 2 +- node-hub/dora-rdt-1b/pyproject.toml | 2 +- node-hub/dora-ugv/pyproject.toml | 2 +- node-hub/dora-vad/pyproject.toml | 11 ++++------- node-hub/dora-yolo/pyproject.toml | 2 +- node-hub/llama-factory-recorder/pyproject.toml | 2 +- node-hub/opencv-plot/pyproject.toml | 2 +- node-hub/opencv-video-capture/pyproject.toml | 2 +- node-hub/pyarrow-assert/pyproject.toml | 2 +- node-hub/pyarrow-sender/pyproject.toml | 2 +- node-hub/terminal-input/pyproject.toml | 2 +- 26 files changed, 33 insertions(+), 36 deletions(-) diff --git a/binaries/cli/src/template/python/__node-name__/pyproject.toml b/binaries/cli/src/template/python/__node-name__/pyproject.toml index 6e01f1cf5..de2998ae8 100644 --- a/binaries/cli/src/template/python/__node-name__/pyproject.toml +++ b/binaries/cli/src/template/python/__node-name__/pyproject.toml @@ -1,12 +1,12 @@ -[tool.poetry] +[project] name = "__node-name__" version = "0.0.0" -authors = ["author"] +authors = [{ name = "Your Name", email = "email@email.com" }] description = "Node Name" license = "MIT License" -homepage = "https://github.com/dora-rs/dora.git" -documentation = "https://github.com/dora-rs/dora/blob/main/node-hub/__node-name__/README.md" readme = "README.md" + +[tool.poetry] packages = [{ include = "__node_name__" }] [tool.poetry.dependencies] @@ -19,7 +19,7 @@ python = "^3.7" pytest = ">= 6.3.4" ruff = ">= 0.9.1" -[tool.poetry.scripts] +[project.scripts] __node-name__ = "__node_name__.main:main" [build-system] diff --git a/node-hub/dora-argotranslate/pyproject.toml b/node-hub/dora-argotranslate/pyproject.toml index 1deaec1c1..5bb86566c 100644 --- a/node-hub/dora-argotranslate/pyproject.toml +++ b/node-hub/dora-argotranslate/pyproject.toml @@ -18,7 +18,7 @@ numpy = "< 2.0.0" python = "^3.7" argostranslate = "^1.9.6" -[tool.poetry.scripts] +[project.scripts] dora-argotranslate = "dora_argotranslate.main:main" [build-system] diff --git a/node-hub/dora-distil-whisper/pyproject.toml b/node-hub/dora-distil-whisper/pyproject.toml index 6544e8a1e..a1b43d243 100644 --- a/node-hub/dora-distil-whisper/pyproject.toml +++ b/node-hub/dora-distil-whisper/pyproject.toml @@ -23,7 +23,7 @@ python = "^3.7" modelscope = "^1.18.1" lightning-whisper-mlx = { version = "^0.0.10", platform = "darwin" } -[tool.poetry.scripts] +[project.scripts] dora-distil-whisper = "dora_distil_whisper.main:main" [tool.poetry.dev-dependencies] diff --git a/node-hub/dora-echo/pyproject.toml b/node-hub/dora-echo/pyproject.toml index e72d3ed13..2025167b5 100644 --- a/node-hub/dora-echo/pyproject.toml +++ b/node-hub/dora-echo/pyproject.toml @@ -16,7 +16,7 @@ numpy = "< 2.0.0" pyarrow = ">= 5.0.0" python = "^3.7" -[tool.poetry.scripts] +[project.scripts] dora-echo = "dora_echo.main:main" [build-system] diff --git a/node-hub/dora-internvl/pyproject.toml b/node-hub/dora-internvl/pyproject.toml index 19fadd974..878929b8f 100644 --- a/node-hub/dora-internvl/pyproject.toml +++ b/node-hub/dora-internvl/pyproject.toml @@ -25,7 +25,7 @@ einops-exts = "^0.0.4" timm = "^0.9.12" sentencepiece = "^0.1.99" -[tool.poetry.scripts] +[project.scripts] dora-internvl = "dora_internvl.main:main" [build-system] diff --git a/node-hub/dora-keyboard/pyproject.toml b/node-hub/dora-keyboard/pyproject.toml index a3a0bacee..4aa4ff01e 100644 --- a/node-hub/dora-keyboard/pyproject.toml +++ b/node-hub/dora-keyboard/pyproject.toml @@ -17,7 +17,7 @@ pyarrow = ">= 5.0.0" pynput = "^1.6.0" python = "^3.7" -[tool.poetry.scripts] +[project.scripts] dora-keyboard = "dora_keyboard.main:main" [build-system] diff --git a/node-hub/dora-microphone/pyproject.toml b/node-hub/dora-microphone/pyproject.toml index fc4e53769..732bfa9a3 100644 --- a/node-hub/dora-microphone/pyproject.toml +++ b/node-hub/dora-microphone/pyproject.toml @@ -17,7 +17,7 @@ pyarrow = ">= 5.0.0" sounddevice = "^0.4.6" python = "^3.7" -[tool.poetry.scripts] +[project.scripts] dora-microphone = "dora_microphone.main:main" [build-system] diff --git a/node-hub/dora-openai-server/pyproject.toml b/node-hub/dora-openai-server/pyproject.toml index c031037a3..96903b268 100644 --- a/node-hub/dora-openai-server/pyproject.toml +++ b/node-hub/dora-openai-server/pyproject.toml @@ -20,7 +20,7 @@ asyncio = "^3.4" uvicorn = "^0.31" pydantic = "^2.9" -[tool.poetry.scripts] +[project.scripts] dora-openai-server = "dora_openai_server.main:main" [build-system] diff --git a/node-hub/dora-opus/pyproject.toml b/node-hub/dora-opus/pyproject.toml index e02847199..35647b6d2 100644 --- a/node-hub/dora-opus/pyproject.toml +++ b/node-hub/dora-opus/pyproject.toml @@ -22,7 +22,7 @@ modelscope = "^1.18.1" sentencepiece = "^0.1.99" torch = "^2.2.0" -[tool.poetry.scripts] +[project.scripts] dora-opus = "dora_opus.main:main" [build-system] diff --git a/node-hub/dora-outtetts/pyproject.toml b/node-hub/dora-outtetts/pyproject.toml index 969d7076e..6c1b34679 100644 --- a/node-hub/dora-outtetts/pyproject.toml +++ b/node-hub/dora-outtetts/pyproject.toml @@ -22,7 +22,7 @@ llama-cpp-python = "^0.3.5" pytest = ">= 6.3.4" ruff = ">= 0.9.1" -[tool.poetry.scripts] +[project.scripts] dora-outtetts = "dora_outtetts.main:main" [build-system] diff --git a/node-hub/dora-parler/pyproject.toml b/node-hub/dora-parler/pyproject.toml index 633096405..54b81f2c2 100644 --- a/node-hub/dora-parler/pyproject.toml +++ b/node-hub/dora-parler/pyproject.toml @@ -24,7 +24,7 @@ pyaudio = "^0.2.14" modelscope = "^1.18.1" -[tool.poetry.scripts] +[project.scripts] dora-parler = "dora_parler.main:main" [build-system] diff --git a/node-hub/dora-piper/pyproject.toml b/node-hub/dora-piper/pyproject.toml index cddc3221f..fed751be9 100644 --- a/node-hub/dora-piper/pyproject.toml +++ b/node-hub/dora-piper/pyproject.toml @@ -17,7 +17,7 @@ numpy = "< 2.0.0" [tool.poetry.dev-dependencies] pytest = "^8.3.4" -[tool.poetry.scripts] +[project.scripts] dora-piper = "dora_piper.main:main" [build-system] diff --git a/node-hub/dora-pyaudio/pyproject.toml b/node-hub/dora-pyaudio/pyproject.toml index c1ff8824f..69f43c5e9 100644 --- a/node-hub/dora-pyaudio/pyproject.toml +++ b/node-hub/dora-pyaudio/pyproject.toml @@ -20,7 +20,7 @@ pytest = ">= 6.3.4" ruff = ">= 0.9.1" -[tool.poetry.scripts] +[project.scripts] dora-pyaudio = "dora_pyaudio.main:main" [build-system] diff --git a/node-hub/dora-pyorbbecksdk/pyproject.toml b/node-hub/dora-pyorbbecksdk/pyproject.toml index 357b0b374..e7f20fa02 100644 --- a/node-hub/dora-pyorbbecksdk/pyproject.toml +++ b/node-hub/dora-pyorbbecksdk/pyproject.toml @@ -18,7 +18,7 @@ numpy = "< 2.0.0" opencv-python = ">= 4.1.1" -[tool.poetry.scripts] +[project.scripts] dora-pyorbbecksdk = "dora_pyorbbecksdk.main:main" [build-system] diff --git a/node-hub/dora-pyrealsense/pyproject.toml b/node-hub/dora-pyrealsense/pyproject.toml index 5ff42b402..b9556fba1 100644 --- a/node-hub/dora-pyrealsense/pyproject.toml +++ b/node-hub/dora-pyrealsense/pyproject.toml @@ -20,7 +20,7 @@ pyrealsense2 = [ pyrealsense2-macosx = { version = "2.54.2", platform = "darwin" } -[tool.poetry.scripts] +[project.scripts] dora-pyrealsense = "dora_pyrealsense.main:main" [build-system] diff --git a/node-hub/dora-qwenvl/pyproject.toml b/node-hub/dora-qwenvl/pyproject.toml index b6881d539..08c427081 100644 --- a/node-hub/dora-qwenvl/pyproject.toml +++ b/node-hub/dora-qwenvl/pyproject.toml @@ -26,7 +26,7 @@ peft = "0.13.2" # flash_attn = "^2.6.1" # Install using: pip install -U flash-attn --no-build-isolation -[tool.poetry.scripts] +[project.scripts] dora-qwenvl = "dora_qwenvl.main:main" [build-system] diff --git a/node-hub/dora-rdt-1b/pyproject.toml b/node-hub/dora-rdt-1b/pyproject.toml index 81573cb6c..c6a62587e 100644 --- a/node-hub/dora-rdt-1b/pyproject.toml +++ b/node-hub/dora-rdt-1b/pyproject.toml @@ -38,7 +38,7 @@ ruff = ">= 0.9.1" extend-exclude = 'dora_rdt_1b/RoboticsDiffusionTransformer' -[tool.poetry.scripts] +[project.scripts] dora-rdt-1b = "dora_rdt_1b.main:main" [build-system] diff --git a/node-hub/dora-ugv/pyproject.toml b/node-hub/dora-ugv/pyproject.toml index dae5028ab..32974e435 100644 --- a/node-hub/dora-ugv/pyproject.toml +++ b/node-hub/dora-ugv/pyproject.toml @@ -13,7 +13,7 @@ dora-rs = "^0.3.6" python = "^3.7" -[tool.poetry.scripts] +[project.scripts] dora-ugv = "dora_ugv.main:main" [build-system] diff --git a/node-hub/dora-vad/pyproject.toml b/node-hub/dora-vad/pyproject.toml index ce87d1c8c..9585c04a5 100644 --- a/node-hub/dora-vad/pyproject.toml +++ b/node-hub/dora-vad/pyproject.toml @@ -1,14 +1,11 @@ -[tool.poetry] +[project] name = "dora-vad" version = "0.3.8" description = "Dora Node for Text translating using Argostranslate" readme = "README.md" -authors = [ - "Haixuan Xavier Tao ", - "Enzo Le Van ", - "Félix Huang ", -] +authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] +[tool.poetry] packages = [{ include = "dora_vad" }] [tool.poetry.dependencies] @@ -18,7 +15,7 @@ python = "^3.7" silero-vad = "^5.1" -[tool.poetry.scripts] +[project.scripts] dora-vad = "dora_vad.main:main" [build-system] diff --git a/node-hub/dora-yolo/pyproject.toml b/node-hub/dora-yolo/pyproject.toml index 3878e6883..f571eec8e 100644 --- a/node-hub/dora-yolo/pyproject.toml +++ b/node-hub/dora-yolo/pyproject.toml @@ -17,7 +17,7 @@ numpy = "< 2.0.0" ultralytics = "^8.3.24" python = "^3.7" -[tool.poetry.scripts] +[project.scripts] dora-yolo = "dora_yolo.main:main" [build-system] diff --git a/node-hub/llama-factory-recorder/pyproject.toml b/node-hub/llama-factory-recorder/pyproject.toml index beea2bd01..4a8ce7912 100644 --- a/node-hub/llama-factory-recorder/pyproject.toml +++ b/node-hub/llama-factory-recorder/pyproject.toml @@ -17,7 +17,7 @@ dora-rs = "^0.3.6" pillow = "^10.4.0" opencv-python = ">= 4.1.1" -[tool.poetry.scripts] +[project.scripts] llama-factory-recorder = "llama_factory_recorder.main:main" [build-system] diff --git a/node-hub/opencv-plot/pyproject.toml b/node-hub/opencv-plot/pyproject.toml index c6ca44d34..21a9789ab 100644 --- a/node-hub/opencv-plot/pyproject.toml +++ b/node-hub/opencv-plot/pyproject.toml @@ -17,7 +17,7 @@ numpy = "< 2.0.0" opencv-python = ">= 4.1.1" python = "^3.7" -[tool.poetry.scripts] +[project.scripts] opencv-plot = "opencv_plot.main:main" [build-system] diff --git a/node-hub/opencv-video-capture/pyproject.toml b/node-hub/opencv-video-capture/pyproject.toml index c0c077bd7..cb3103741 100644 --- a/node-hub/opencv-video-capture/pyproject.toml +++ b/node-hub/opencv-video-capture/pyproject.toml @@ -17,7 +17,7 @@ numpy = "< 2.0.0" opencv-python = ">= 4.1.1" python = "^3.7" -[tool.poetry.scripts] +[project.scripts] opencv-video-capture = "opencv_video_capture.main:main" [build-system] diff --git a/node-hub/pyarrow-assert/pyproject.toml b/node-hub/pyarrow-assert/pyproject.toml index 47abfebec..a6b7a4104 100644 --- a/node-hub/pyarrow-assert/pyproject.toml +++ b/node-hub/pyarrow-assert/pyproject.toml @@ -17,7 +17,7 @@ numpy = "< 2.0.0" pyarrow = ">= 5.0.0" python = "^3.7" -[tool.poetry.scripts] +[project.scripts] pyarrow-assert = "pyarrow_assert.main:main" [build-system] diff --git a/node-hub/pyarrow-sender/pyproject.toml b/node-hub/pyarrow-sender/pyproject.toml index 878989950..66254bd58 100644 --- a/node-hub/pyarrow-sender/pyproject.toml +++ b/node-hub/pyarrow-sender/pyproject.toml @@ -18,7 +18,7 @@ numpy = "< 2.0.0" pyarrow = ">= 5.0.0" python = "^3.7" -[tool.poetry.scripts] +[project.scripts] pyarrow-sender = "pyarrow_sender.main:main" [build-system] diff --git a/node-hub/terminal-input/pyproject.toml b/node-hub/terminal-input/pyproject.toml index 63bf1ba84..7b3bf67d9 100644 --- a/node-hub/terminal-input/pyproject.toml +++ b/node-hub/terminal-input/pyproject.toml @@ -18,7 +18,7 @@ numpy = "< 2.0.0" pyarrow = ">= 5.0.0" python = "^3.7" -[tool.poetry.scripts] +[project.scripts] terminal-input = "terminal_input.main:main" [build-system] From 6d6ac108db32c095ac648f85011deb40301e5dd0 Mon Sep 17 00:00:00 2001 From: haixuantao Date: Fri, 17 Jan 2025 11:23:23 +0100 Subject: [PATCH 06/17] Remove poetry packages --- node-hub/dora-argotranslate/pyproject.toml | 2 -- node-hub/dora-distil-whisper/pyproject.toml | 7 ++----- node-hub/dora-echo/pyproject.toml | 5 +++-- node-hub/dora-internvl/pyproject.toml | 2 -- node-hub/dora-keyboard/pyproject.toml | 2 -- node-hub/dora-microphone/pyproject.toml | 2 -- node-hub/dora-openai-server/pyproject.toml | 2 -- node-hub/dora-opus/pyproject.toml | 3 --- node-hub/dora-outtetts/pyproject.toml | 7 ++----- node-hub/dora-parler/pyproject.toml | 2 -- node-hub/dora-piper/pyproject.toml | 6 ++---- node-hub/dora-pyaudio/pyproject.toml | 7 ++----- node-hub/dora-pyorbbecksdk/pyproject.toml | 2 -- node-hub/dora-pyrealsense/pyproject.toml | 2 -- node-hub/dora-qwenvl/pyproject.toml | 2 -- node-hub/dora-rdt-1b/pyproject.toml | 6 ++---- node-hub/dora-ugv/pyproject.toml | 2 -- node-hub/dora-vad/pyproject.toml | 2 -- node-hub/dora-yolo/pyproject.toml | 2 -- node-hub/llama-factory-recorder/pyproject.toml | 2 -- node-hub/opencv-plot/pyproject.toml | 2 -- node-hub/opencv-video-capture/pyproject.toml | 2 -- node-hub/pyarrow-assert/pyproject.toml | 2 -- node-hub/pyarrow-sender/pyproject.toml | 2 -- node-hub/terminal-input/pyproject.toml | 2 -- 25 files changed, 13 insertions(+), 64 deletions(-) diff --git a/node-hub/dora-argotranslate/pyproject.toml b/node-hub/dora-argotranslate/pyproject.toml index 5bb86566c..5d5f4c91a 100644 --- a/node-hub/dora-argotranslate/pyproject.toml +++ b/node-hub/dora-argotranslate/pyproject.toml @@ -9,8 +9,6 @@ authors = [ { name = "Félix Huang", email = "felix.huang.net@gmail.com" }, ] -[tool.poetry] -packages = [{ include = "dora_argotranslate" }] [tool.poetry.dependencies] dora-rs = "^0.3.6" diff --git a/node-hub/dora-distil-whisper/pyproject.toml b/node-hub/dora-distil-whisper/pyproject.toml index a1b43d243..a362175ce 100644 --- a/node-hub/dora-distil-whisper/pyproject.toml +++ b/node-hub/dora-distil-whisper/pyproject.toml @@ -9,8 +9,6 @@ description = "Dora dora-distil-whisper" license = "MIT License" readme = "README.md" -[tool.poetry] -packages = [{ include = "dora_distil_whisper" }] [tool.poetry.dependencies] dora-rs = "^0.3.6" @@ -26,9 +24,8 @@ lightning-whisper-mlx = { version = "^0.0.10", platform = "darwin" } [project.scripts] dora-distil-whisper = "dora_distil_whisper.main:main" -[tool.poetry.dev-dependencies] -pytest = ">= 6.3.4" -ruff = ">= 0.9.1" +[dependency-groups] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [build-system] requires = ["poetry-core>=1.8.0"] diff --git a/node-hub/dora-echo/pyproject.toml b/node-hub/dora-echo/pyproject.toml index 2025167b5..d3f14c61c 100644 --- a/node-hub/dora-echo/pyproject.toml +++ b/node-hub/dora-echo/pyproject.toml @@ -7,8 +7,6 @@ authors = [ ] description = "Dora echo" license = "MIT License" -[tool.poetry] -packages = [{ include = "dora_echo" }] [tool.poetry.dependencies] dora-rs = "^0.3.6" @@ -16,6 +14,9 @@ numpy = "< 2.0.0" pyarrow = ">= 5.0.0" python = "^3.7" +[dependency-groups] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] + [project.scripts] dora-echo = "dora_echo.main:main" diff --git a/node-hub/dora-internvl/pyproject.toml b/node-hub/dora-internvl/pyproject.toml index 878929b8f..3c513135d 100644 --- a/node-hub/dora-internvl/pyproject.toml +++ b/node-hub/dora-internvl/pyproject.toml @@ -8,8 +8,6 @@ authors = [ description = "Dora Node for VLM" readme = "README.md" -[tool.poetry] -packages = [{ include = "dora_internvl" }] [tool.poetry.dependencies] python = "^3.7" diff --git a/node-hub/dora-keyboard/pyproject.toml b/node-hub/dora-keyboard/pyproject.toml index 4aa4ff01e..a0cdf3486 100644 --- a/node-hub/dora-keyboard/pyproject.toml +++ b/node-hub/dora-keyboard/pyproject.toml @@ -7,8 +7,6 @@ authors = [ ] description = "Dora dora-keyboard" license = "MIT License" -[tool.poetry] -packages = [{ include = "dora_keyboard" }] [tool.poetry.dependencies] dora-rs = "^0.3.6" diff --git a/node-hub/dora-microphone/pyproject.toml b/node-hub/dora-microphone/pyproject.toml index 732bfa9a3..3a64c3dc7 100644 --- a/node-hub/dora-microphone/pyproject.toml +++ b/node-hub/dora-microphone/pyproject.toml @@ -7,8 +7,6 @@ authors = [ ] description = "Dora dora-microphone" license = "MIT License" -[tool.poetry] -packages = [{ include = "dora_microphone" }] [tool.poetry.dependencies] dora-rs = "^0.3.6" diff --git a/node-hub/dora-openai-server/pyproject.toml b/node-hub/dora-openai-server/pyproject.toml index 96903b268..45ebfb9e2 100644 --- a/node-hub/dora-openai-server/pyproject.toml +++ b/node-hub/dora-openai-server/pyproject.toml @@ -7,8 +7,6 @@ authors = [ ] description = "Dora OpenAI API Server" license = "MIT License" -[tool.poetry] -packages = [{ include = "dora_openai_server" }] [tool.poetry.dependencies] dora-rs = "^0.3.6" diff --git a/node-hub/dora-opus/pyproject.toml b/node-hub/dora-opus/pyproject.toml index 35647b6d2..dc4e50ed0 100644 --- a/node-hub/dora-opus/pyproject.toml +++ b/node-hub/dora-opus/pyproject.toml @@ -10,9 +10,6 @@ authors = [ ] -[tool.poetry] -packages = [{ include = "dora_opus" }] - [tool.poetry.dependencies] dora-rs = "^0.3.6" numpy = "< 2.0.0" diff --git a/node-hub/dora-outtetts/pyproject.toml b/node-hub/dora-outtetts/pyproject.toml index 6c1b34679..7df581c74 100644 --- a/node-hub/dora-outtetts/pyproject.toml +++ b/node-hub/dora-outtetts/pyproject.toml @@ -7,8 +7,6 @@ description = "dora-outtetts" readme = "README.md" requires-python = ">=3.10" -[tool.poetry] -packages = [{ include = "dora_outtetts" }] [tool.poetry.dependencies] dora-rs = "^0.3.6" @@ -18,9 +16,8 @@ python = "^3.10" outetts = "^0.2.3" llama-cpp-python = "^0.3.5" -[tool.poetry.dev-dependencies] -pytest = ">= 6.3.4" -ruff = ">= 0.9.1" +[dependency-groups] +dev = ["pytest >=8.1.1,<9"] [project.scripts] dora-outtetts = "dora_outtetts.main:main" diff --git a/node-hub/dora-parler/pyproject.toml b/node-hub/dora-parler/pyproject.toml index 54b81f2c2..e5cf258c5 100644 --- a/node-hub/dora-parler/pyproject.toml +++ b/node-hub/dora-parler/pyproject.toml @@ -8,8 +8,6 @@ authors = [ description = "Dora Node for Text to speech with dora Parler-TTS" readme = "README.md" -[tool.poetry] -packages = [{ include = "dora_parler" }] [tool.poetry.dependencies] dora-rs = "^0.3.6" diff --git a/node-hub/dora-piper/pyproject.toml b/node-hub/dora-piper/pyproject.toml index fed751be9..7d3bec31c 100644 --- a/node-hub/dora-piper/pyproject.toml +++ b/node-hub/dora-piper/pyproject.toml @@ -5,8 +5,6 @@ authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] description = "Dora Node for using Agilex piper" readme = "README.md" -[tool.poetry] -packages = [{ include = "dora_piper" }] [tool.poetry.dependencies] dora-rs = "^0.3.6" @@ -14,8 +12,8 @@ python = "^3.7" piper_sdk = "^0.0.8" numpy = "< 2.0.0" -[tool.poetry.dev-dependencies] -pytest = "^8.3.4" +[dependency-groups] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] dora-piper = "dora_piper.main:main" diff --git a/node-hub/dora-pyaudio/pyproject.toml b/node-hub/dora-pyaudio/pyproject.toml index 69f43c5e9..3217c1e37 100644 --- a/node-hub/dora-pyaudio/pyproject.toml +++ b/node-hub/dora-pyaudio/pyproject.toml @@ -5,8 +5,6 @@ authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] description = "dora-pyaudio" license = "MIT License" -[tool.poetry] -packages = [{ include = "dora_pyaudio" }] [tool.poetry.dependencies] dora-rs = "^0.3.6" @@ -15,9 +13,8 @@ pyarrow = ">= 5.0.0" python = ">= 3.8" pyaudio = ">= 0.1.0" -[tool.poetry.dev-dependencies] -pytest = ">= 6.3.4" -ruff = ">= 0.9.1" +[dependency-groups] +dev = ["pytest >=8.1.1,<9"] [project.scripts] diff --git a/node-hub/dora-pyorbbecksdk/pyproject.toml b/node-hub/dora-pyorbbecksdk/pyproject.toml index e7f20fa02..21dbbfcc6 100644 --- a/node-hub/dora-pyorbbecksdk/pyproject.toml +++ b/node-hub/dora-pyorbbecksdk/pyproject.toml @@ -8,8 +8,6 @@ authors = [ description = "Dora Node for capturing video with PyOrbbeck SDK" readme = "README.md" -[tool.poetry] -packages = [{ include = "dora_pyorbbecksdk" }] [tool.poetry.dependencies] dora-rs = "^0.3.6" diff --git a/node-hub/dora-pyrealsense/pyproject.toml b/node-hub/dora-pyrealsense/pyproject.toml index b9556fba1..bfd4db633 100644 --- a/node-hub/dora-pyrealsense/pyproject.toml +++ b/node-hub/dora-pyrealsense/pyproject.toml @@ -5,8 +5,6 @@ authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] description = "Dora Node for capturing video with Pyrealsense" readme = "README.md" -[tool.poetry] -packages = [{ include = "dora_pyrealsense" }] [tool.poetry.dependencies] dora-rs = "^0.3.6" diff --git a/node-hub/dora-qwenvl/pyproject.toml b/node-hub/dora-qwenvl/pyproject.toml index 08c427081..f699a2a04 100644 --- a/node-hub/dora-qwenvl/pyproject.toml +++ b/node-hub/dora-qwenvl/pyproject.toml @@ -8,8 +8,6 @@ authors = [ description = "Dora Node for VLM" readme = "README.md" -[tool.poetry] -packages = [{ include = "dora_qwenvl" }] [tool.poetry.dependencies] python = "^3.7" diff --git a/node-hub/dora-rdt-1b/pyproject.toml b/node-hub/dora-rdt-1b/pyproject.toml index c6a62587e..d8912add3 100644 --- a/node-hub/dora-rdt-1b/pyproject.toml +++ b/node-hub/dora-rdt-1b/pyproject.toml @@ -5,8 +5,6 @@ authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] description = "Dora Node for RDT 1B" readme = "README.md" -[tool.poetry] -packages = [{ include = "dora_rdt_1b" }] [tool.poetry.dependencies] python = "^3.7" @@ -30,8 +28,8 @@ huggingface_hub = "0.23.5" # flash_attn = "^2.6.1" # Install using: pip install -U flash-attn --no-build-isolation -[tool.poetry.dev-dependencies] -pytest = "^8.3.4" +[dependency-groups] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] ruff = ">= 0.9.1" [tool.black] diff --git a/node-hub/dora-ugv/pyproject.toml b/node-hub/dora-ugv/pyproject.toml index 32974e435..346beb920 100644 --- a/node-hub/dora-ugv/pyproject.toml +++ b/node-hub/dora-ugv/pyproject.toml @@ -5,8 +5,6 @@ authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] description = "Dora Node for using Agilex UGV" readme = "README.md" -[tool.poetry] -packages = [{ include = "dora_ugv" }] [tool.poetry.dependencies] dora-rs = "^0.3.6" diff --git a/node-hub/dora-vad/pyproject.toml b/node-hub/dora-vad/pyproject.toml index 9585c04a5..7d9386362 100644 --- a/node-hub/dora-vad/pyproject.toml +++ b/node-hub/dora-vad/pyproject.toml @@ -5,8 +5,6 @@ description = "Dora Node for Text translating using Argostranslate" readme = "README.md" authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] -[tool.poetry] -packages = [{ include = "dora_vad" }] [tool.poetry.dependencies] dora-rs = "^0.3.6" diff --git a/node-hub/dora-yolo/pyproject.toml b/node-hub/dora-yolo/pyproject.toml index f571eec8e..e4dcf8e19 100644 --- a/node-hub/dora-yolo/pyproject.toml +++ b/node-hub/dora-yolo/pyproject.toml @@ -8,8 +8,6 @@ authors = [ description = "Dora Node for object detection with dora YOLOv8" readme = "README.md" -[tool.poetry] -packages = [{ include = "dora_yolo" }] [tool.poetry.dependencies] dora-rs = "^0.3.6" diff --git a/node-hub/llama-factory-recorder/pyproject.toml b/node-hub/llama-factory-recorder/pyproject.toml index 4a8ce7912..0fdc7a6f5 100644 --- a/node-hub/llama-factory-recorder/pyproject.toml +++ b/node-hub/llama-factory-recorder/pyproject.toml @@ -8,8 +8,6 @@ authors = [ description = "Dora Node for VLM" readme = "README.md" -[tool.poetry] -packages = [{ include = "llama_factory_recorder" }] [tool.poetry.dependencies] python = "^3.7" diff --git a/node-hub/opencv-plot/pyproject.toml b/node-hub/opencv-plot/pyproject.toml index 21a9789ab..98b5adaba 100644 --- a/node-hub/opencv-plot/pyproject.toml +++ b/node-hub/opencv-plot/pyproject.toml @@ -8,8 +8,6 @@ authors = [ description = "Dora Node for plotting text and bbox on image with OpenCV" readme = "README.md" -[tool.poetry] -packages = [{ include = "opencv_plot" }] [tool.poetry.dependencies] dora-rs = "^0.3.6" diff --git a/node-hub/opencv-video-capture/pyproject.toml b/node-hub/opencv-video-capture/pyproject.toml index cb3103741..b208d7cec 100644 --- a/node-hub/opencv-video-capture/pyproject.toml +++ b/node-hub/opencv-video-capture/pyproject.toml @@ -8,8 +8,6 @@ authors = [ description = "Dora Node for capturing video with OpenCV" readme = "README.md" -[tool.poetry] -packages = [{ include = "opencv_video_capture" }] [tool.poetry.dependencies] dora-rs = "^0.3.6" diff --git a/node-hub/pyarrow-assert/pyproject.toml b/node-hub/pyarrow-assert/pyproject.toml index a6b7a4104..dd4ca6a3e 100644 --- a/node-hub/pyarrow-assert/pyproject.toml +++ b/node-hub/pyarrow-assert/pyproject.toml @@ -8,8 +8,6 @@ authors = [ ] description = "Dora Node for plotting text and bbox on image with OpenCV" license = "MIT License" -[tool.poetry] -packages = [{ include = "pyarrow_assert" }] [tool.poetry.dependencies] dora-rs = "^0.3.6" diff --git a/node-hub/pyarrow-sender/pyproject.toml b/node-hub/pyarrow-sender/pyproject.toml index 66254bd58..ce08e8660 100644 --- a/node-hub/pyarrow-sender/pyproject.toml +++ b/node-hub/pyarrow-sender/pyproject.toml @@ -9,8 +9,6 @@ description = "Dora pyarrow Sender" license = "MIT License" readme = "README.md" -[tool.poetry] -packages = [{ include = "pyarrow_sender" }] [tool.poetry.dependencies] dora-rs = "^0.3.6" diff --git a/node-hub/terminal-input/pyproject.toml b/node-hub/terminal-input/pyproject.toml index 7b3bf67d9..04f52b11f 100644 --- a/node-hub/terminal-input/pyproject.toml +++ b/node-hub/terminal-input/pyproject.toml @@ -9,8 +9,6 @@ description = "Dora terminal input" license = "MIT License" readme = "README.md" -[tool.poetry] -packages = [{ include = "terminal_input" }] [tool.poetry.dependencies] dora-rs = "^0.3.6" From afb20cbadc0c352e78ab11aec76386c5966e6cfe Mon Sep 17 00:00:00 2001 From: haixuantao Date: Fri, 17 Jan 2025 12:08:10 +0100 Subject: [PATCH 07/17] Migrate dependencies to standardised version --- .../python/__node-name__/pyproject.toml | 13 ++---- node-hub/README.md | 29 +++++++------- node-hub/dora-argotranslate/pyproject.toml | 6 +-- node-hub/dora-distil-whisper/pyproject.toml | 21 +++++----- node-hub/dora-echo/pyproject.toml | 6 +-- node-hub/dora-internvl/pyproject.toml | 27 +++++++------ node-hub/dora-keyboard/pyproject.toml | 13 +++--- node-hub/dora-microphone/pyproject.toml | 13 +++--- node-hub/dora-openai-server/pyproject.toml | 19 ++++----- node-hub/dora-opus/pyproject.toml | 17 ++++---- node-hub/dora-outtetts/pyproject.toml | 16 ++++---- node-hub/dora-parler/pyproject.toml | 23 ++++++----- node-hub/dora-piper/pyproject.toml | 6 +-- node-hub/dora-pyaudio/pyproject.toml | 13 +++--- node-hub/dora-pyorbbecksdk/pyproject.toml | 6 +-- node-hub/dora-pyrealsense/pyproject.toml | 18 ++++----- node-hub/dora-qwenvl/pyproject.toml | 25 ++++++------ node-hub/dora-rdt-1b/pyproject.toml | 40 +++++++++---------- node-hub/dora-ugv/pyproject.toml | 4 +- node-hub/dora-vad/pyproject.toml | 6 +-- node-hub/dora-yolo/pyproject.toml | 6 +-- .../llama-factory-recorder/pyproject.toml | 11 ++--- node-hub/opencv-plot/pyproject.toml | 6 +-- node-hub/opencv-video-capture/pyproject.toml | 6 +-- node-hub/pyarrow-assert/pyproject.toml | 6 +-- node-hub/pyarrow-sender/pyproject.toml | 6 +-- node-hub/terminal-input/pyproject.toml | 6 +-- 27 files changed, 160 insertions(+), 208 deletions(-) diff --git a/binaries/cli/src/template/python/__node-name__/pyproject.toml b/binaries/cli/src/template/python/__node-name__/pyproject.toml index de2998ae8..77249693f 100644 --- a/binaries/cli/src/template/python/__node-name__/pyproject.toml +++ b/binaries/cli/src/template/python/__node-name__/pyproject.toml @@ -6,18 +6,11 @@ description = "Node Name" license = "MIT License" readme = "README.md" -[tool.poetry] -packages = [{ include = "__node_name__" }] -[tool.poetry.dependencies] -dora-rs = "^0.3.6" -numpy = "< 2.0.0" -pyarrow = ">= 15.0.0" -python = "^3.7" +dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "pyarrow >= 15.0.0"] -[tool.poetry.dev-dependencies] -pytest = ">= 6.3.4" -ruff = ">= 0.9.1" +[dependency-groups] +dev = ["pytest >=8.1.1,<9", "ruff >=0.9.1"] [project.scripts] __node-name__ = "__node_name__.main:main" diff --git a/node-hub/README.md b/node-hub/README.md index 9e59bc162..408e64403 100644 --- a/node-hub/README.md +++ b/node-hub/README.md @@ -27,23 +27,22 @@ def main(): And then you will need to adapt the following `pyproject.toml` file: ```toml -[tool.poetry] +[project] name = "[name of the node e.g. video-encoder, with '-' to replace spaces]" version = "0.1" -authors = ["[Pseudo/Name] <[email]>"] +authors = [{name= "[Pseudo/Name]", email="[email]"] description = "Dora Node for []" readme = "README.md" -packages = [ - { include = "main.py", to = "[name of the node with '_' to replace spaces]" } -] -[tool.poetry.dependencies] -python = "^3.11" -dora-rs = "0.3.5" +dependencies = [ +"dora-rs = "0.3.5", + + ... [add your dependencies here] ... +] -[tool.poetry.scripts] +[project.scripts] [name of the node with '-' to replace spaces] = "[name of the node with '_' to replace spaces].main:main" [build-system] @@ -56,7 +55,7 @@ Finally, the README.md file should explicit all inputs/outputs of the node and h # Example ```toml -[tool.poetry] +[project] name = "opencv-plot" version = "0.1" authors = [ @@ -70,12 +69,12 @@ packages = [ { include = "main.py", to = "opencv_plot" } ] -[tool.poetry.dependencies] -python = "^3.11" -dora-rs = "^0.3.5" -opencv-python = "^4.10.0.84" +dependencies = [ +"dora-rs = ^0.3.8", + +] -[tool.poetry.scripts] +[project.scripts] opencv-plot = "opencv_plot.main:main" [build-system] diff --git a/node-hub/dora-argotranslate/pyproject.toml b/node-hub/dora-argotranslate/pyproject.toml index 5d5f4c91a..631fb6b44 100644 --- a/node-hub/dora-argotranslate/pyproject.toml +++ b/node-hub/dora-argotranslate/pyproject.toml @@ -10,11 +10,7 @@ authors = [ ] -[tool.poetry.dependencies] -dora-rs = "^0.3.6" -numpy = "< 2.0.0" -python = "^3.7" -argostranslate = "^1.9.6" +dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "argostranslate >= 1.9.6"] [project.scripts] dora-argotranslate = "dora_argotranslate.main:main" diff --git a/node-hub/dora-distil-whisper/pyproject.toml b/node-hub/dora-distil-whisper/pyproject.toml index a362175ce..85454e700 100644 --- a/node-hub/dora-distil-whisper/pyproject.toml +++ b/node-hub/dora-distil-whisper/pyproject.toml @@ -10,16 +10,17 @@ license = "MIT License" readme = "README.md" -[tool.poetry.dependencies] -dora-rs = "^0.3.6" -numpy = "< 2.0.0" -pyarrow = ">= 5.0.0" -transformers = "^4.0.0" -accelerate = "^0.29.2" -torch = "^2.2.0" -python = "^3.7" -modelscope = "^1.18.1" -lightning-whisper-mlx = { version = "^0.0.10", platform = "darwin" } +dependencies = [ + "dora-rs >= 0.3.6", + "numpy < 2.0.0", + "pyarrow >= 5.0.0", + "transformers >= 4.0.0", + "accelerate >= 0.29.2", + "torch >= 2.2.0", + "modelscope >= 1.18.1", + "lightning-whisper-mlx =^0.0.10; sys_platform == darwin", +] + [project.scripts] dora-distil-whisper = "dora_distil_whisper.main:main" diff --git a/node-hub/dora-echo/pyproject.toml b/node-hub/dora-echo/pyproject.toml index d3f14c61c..15338f2f4 100644 --- a/node-hub/dora-echo/pyproject.toml +++ b/node-hub/dora-echo/pyproject.toml @@ -8,11 +8,7 @@ authors = [ description = "Dora echo" license = "MIT License" -[tool.poetry.dependencies] -dora-rs = "^0.3.6" -numpy = "< 2.0.0" -pyarrow = ">= 5.0.0" -python = "^3.7" +dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "pyarrow >= 5.0.0"] [dependency-groups] dev = ["pytest >=8.1.1", "ruff >=0.9.1"] diff --git a/node-hub/dora-internvl/pyproject.toml b/node-hub/dora-internvl/pyproject.toml index 3c513135d..45d4a63d3 100644 --- a/node-hub/dora-internvl/pyproject.toml +++ b/node-hub/dora-internvl/pyproject.toml @@ -9,19 +9,20 @@ description = "Dora Node for VLM" readme = "README.md" -[tool.poetry.dependencies] -python = "^3.7" -dora-rs = "^0.3.6" -numpy = "< 2.0.0" -torch = "^2.2.0" -torchvision = "^0.17" -transformers = "^4.11.3" -pillow = "^10.0.0" -bitsandbytes = "^0.41.0" -einops = "^0.6.1" -einops-exts = "^0.0.4" -timm = "^0.9.12" -sentencepiece = "^0.1.99" +dependencies = [ + + "dora-rs >= 0.3.6", + "numpy < 2.0.0", + "torch >= 2.2.0", + "torchvision >= 0.17", + "transformers >= 4.11.3", + "pillow >= 10.0.0", + "bitsandbytes >= 0.41.0", + "einops >= 0.6.1", + "einops-exts >= 0.0.4", + "timm >= 0.9.12", + "sentencepiece >= 0.1.99", +] [project.scripts] dora-internvl = "dora_internvl.main:main" diff --git a/node-hub/dora-keyboard/pyproject.toml b/node-hub/dora-keyboard/pyproject.toml index a0cdf3486..9225edbf0 100644 --- a/node-hub/dora-keyboard/pyproject.toml +++ b/node-hub/dora-keyboard/pyproject.toml @@ -8,12 +8,13 @@ authors = [ description = "Dora dora-keyboard" license = "MIT License" -[tool.poetry.dependencies] -dora-rs = "^0.3.6" -numpy = "< 2.0.0" -pyarrow = ">= 5.0.0" -pynput = "^1.6.0" -python = "^3.7" +dependencies = [ + "dora-rs >= 0.3.6", + "numpy < 2.0.0", + "pyarrow >= 5.0.0", + "pynput >= 1.6.0", + +] [project.scripts] dora-keyboard = "dora_keyboard.main:main" diff --git a/node-hub/dora-microphone/pyproject.toml b/node-hub/dora-microphone/pyproject.toml index 3a64c3dc7..9c71f31f1 100644 --- a/node-hub/dora-microphone/pyproject.toml +++ b/node-hub/dora-microphone/pyproject.toml @@ -8,12 +8,13 @@ authors = [ description = "Dora dora-microphone" license = "MIT License" -[tool.poetry.dependencies] -dora-rs = "^0.3.6" -numpy = "< 2.0.0" -pyarrow = ">= 5.0.0" -sounddevice = "^0.4.6" -python = "^3.7" +dependencies = [ + "dora-rs >= 0.3.6", + "numpy < 2.0.0", + "pyarrow >= 5.0.0", + "sounddevice >= 0.4.6", + +] [project.scripts] dora-microphone = "dora_microphone.main:main" diff --git a/node-hub/dora-openai-server/pyproject.toml b/node-hub/dora-openai-server/pyproject.toml index 45ebfb9e2..2e729164c 100644 --- a/node-hub/dora-openai-server/pyproject.toml +++ b/node-hub/dora-openai-server/pyproject.toml @@ -8,15 +8,16 @@ authors = [ description = "Dora OpenAI API Server" license = "MIT License" -[tool.poetry.dependencies] -dora-rs = "^0.3.6" -numpy = "< 2.0.0" -pyarrow = ">= 5.0.0" -python = "^3.7" -fastapi = "^0.115" -asyncio = "^3.4" -uvicorn = "^0.31" -pydantic = "^2.9" +dependencies = [ + "dora-rs >= 0.3.6", + "numpy < 2.0.0", + "pyarrow >= 5.0.0", + + "fastapi >= 0.115", + "asyncio >= 3.4", + "uvicorn >= 0.31", + "pydantic >= 2.9", +] [project.scripts] dora-openai-server = "dora_openai_server.main:main" diff --git a/node-hub/dora-opus/pyproject.toml b/node-hub/dora-opus/pyproject.toml index dc4e50ed0..080b356e8 100644 --- a/node-hub/dora-opus/pyproject.toml +++ b/node-hub/dora-opus/pyproject.toml @@ -10,14 +10,15 @@ authors = [ ] -[tool.poetry.dependencies] -dora-rs = "^0.3.6" -numpy = "< 2.0.0" -python = "^3.7" -transformers = "^4.45" -modelscope = "^1.18.1" -sentencepiece = "^0.1.99" -torch = "^2.2.0" +dependencies = [ + "dora-rs >= 0.3.6", + "numpy < 2.0.0", + + "transformers >= 4.45", + "modelscope >= 1.18.1", + "sentencepiece >= 0.1.99", + "torch >= 2.2.0", +] [project.scripts] dora-opus = "dora_opus.main:main" diff --git a/node-hub/dora-outtetts/pyproject.toml b/node-hub/dora-outtetts/pyproject.toml index 7df581c74..c8f0a087a 100644 --- a/node-hub/dora-outtetts/pyproject.toml +++ b/node-hub/dora-outtetts/pyproject.toml @@ -5,16 +5,16 @@ authors = [] license = "MIT License" description = "dora-outtetts" readme = "README.md" -requires-python = ">=3.10" -[tool.poetry.dependencies] -dora-rs = "^0.3.6" -numpy = "< 2.0.0" -pyarrow = ">= 5.0.0" -python = "^3.10" -outetts = "^0.2.3" -llama-cpp-python = "^0.3.5" +dependencies = [ + "dora-rs >= 0.3.6", + "numpy < 2.0.0", + "pyarrow >= 5.0.0", + "python >= 3.10", + "outetts >= 0.2.3", + "llama-cpp-python = ^0.3.5", +] [dependency-groups] dev = ["pytest >=8.1.1,<9"] diff --git a/node-hub/dora-parler/pyproject.toml b/node-hub/dora-parler/pyproject.toml index e5cf258c5..2fa4116a6 100644 --- a/node-hub/dora-parler/pyproject.toml +++ b/node-hub/dora-parler/pyproject.toml @@ -9,18 +9,19 @@ description = "Dora Node for Text to speech with dora Parler-TTS" readme = "README.md" -[tool.poetry.dependencies] -dora-rs = "^0.3.6" -numpy = "< 2.0.0" -parler_tts = { git = "https://github.com/huggingface/parler-tts.git" } -transformers = ">=4.43.0,<=4.43.3" -torch = "^2.2.0" -torchaudio = "^2.2.2" -sentencepiece = "^0.1.99" -python = "^3.7" -pyaudio = "^0.2.14" -modelscope = "^1.18.1" +dependencies = [ + "dora-rs >= 0.3.6", + "numpy < 2.0.0", + "torch >= 2.2.0", + "torchaudio >= 2.2.2", + "sentencepiece >= 0.1.99", + "pyaudio >= 0.2.14", + "modelscope >= 1.18.1", + "transformers >=4.43.0,<=4.43.3", +] +[tool.uv.sources] +parler_tts = { git = "https://github.com/huggingface/parler-tts.git" } [project.scripts] dora-parler = "dora_parler.main:main" diff --git a/node-hub/dora-piper/pyproject.toml b/node-hub/dora-piper/pyproject.toml index 7d3bec31c..d20e773d2 100644 --- a/node-hub/dora-piper/pyproject.toml +++ b/node-hub/dora-piper/pyproject.toml @@ -6,11 +6,7 @@ description = "Dora Node for using Agilex piper" readme = "README.md" -[tool.poetry.dependencies] -dora-rs = "^0.3.6" -python = "^3.7" -piper_sdk = "^0.0.8" -numpy = "< 2.0.0" +dependencies = ["dora-rs >= 0.3.6", "piper_sdk >= 0.0.8", "numpy < 2.0.0"] [dependency-groups] dev = ["pytest >=8.1.1", "ruff >=0.9.1"] diff --git a/node-hub/dora-pyaudio/pyproject.toml b/node-hub/dora-pyaudio/pyproject.toml index 3217c1e37..7c61bda52 100644 --- a/node-hub/dora-pyaudio/pyproject.toml +++ b/node-hub/dora-pyaudio/pyproject.toml @@ -6,12 +6,13 @@ description = "dora-pyaudio" license = "MIT License" -[tool.poetry.dependencies] -dora-rs = "^0.3.6" -numpy = ">= 1.0.0" -pyarrow = ">= 5.0.0" -python = ">= 3.8" -pyaudio = ">= 0.1.0" +dependencies = [ + "dora-rs >= 0.3.6", + "numpy >= 1.0.0", + "pyarrow >= 5.0.0", + "python >= 3.8", + "pyaudio >= 0.1.0", +] [dependency-groups] dev = ["pytest >=8.1.1,<9"] diff --git a/node-hub/dora-pyorbbecksdk/pyproject.toml b/node-hub/dora-pyorbbecksdk/pyproject.toml index 21dbbfcc6..b20338168 100644 --- a/node-hub/dora-pyorbbecksdk/pyproject.toml +++ b/node-hub/dora-pyorbbecksdk/pyproject.toml @@ -9,11 +9,7 @@ description = "Dora Node for capturing video with PyOrbbeck SDK" readme = "README.md" -[tool.poetry.dependencies] -dora-rs = "^0.3.6" -python = "^3.7" -numpy = "< 2.0.0" -opencv-python = ">= 4.1.1" +dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "opencv-python >= 4.1.1"] [project.scripts] diff --git a/node-hub/dora-pyrealsense/pyproject.toml b/node-hub/dora-pyrealsense/pyproject.toml index bfd4db633..189cb018d 100644 --- a/node-hub/dora-pyrealsense/pyproject.toml +++ b/node-hub/dora-pyrealsense/pyproject.toml @@ -6,18 +6,14 @@ description = "Dora Node for capturing video with Pyrealsense" readme = "README.md" -[tool.poetry.dependencies] -dora-rs = "^0.3.6" -numpy = "< 2.0.0" -opencv-python = ">= 4.1.1" -python = "^3.7" -pyrealsense2 = [ - { version = "2.54.1.5216", platform = "linux" }, - { version = "2.54.1.5216", platform = "windows" }, +dependencies = [ + "dora-rs >= 0.3.6", + "numpy < 2.0.0", + "opencv-python >= 4.1.1", + "pyrealsense2-macosx = 2.54.2; sys_platform == 'darwin'", + "pyrealsense2 = '2.54.1.5216'; sys_platform == 'linux'", + "pyrealsense2 = '2.54.1.5216'; sys_platform == 'windows'", ] -pyrealsense2-macosx = { version = "2.54.2", platform = "darwin" } - - [project.scripts] dora-pyrealsense = "dora_pyrealsense.main:main" diff --git a/node-hub/dora-qwenvl/pyproject.toml b/node-hub/dora-qwenvl/pyproject.toml index f699a2a04..ce496ae89 100644 --- a/node-hub/dora-qwenvl/pyproject.toml +++ b/node-hub/dora-qwenvl/pyproject.toml @@ -9,18 +9,19 @@ description = "Dora Node for VLM" readme = "README.md" -[tool.poetry.dependencies] -python = "^3.7" -dora-rs = "^0.3.6" -numpy = "< 2.0.0" -torch = "^2.2.0" -torchvision = "^0.20" -transformers = "^4.45" -qwen-vl-utils = "^0.0.2" -accelerate = "^0.33" -opencv-python = ">= 4.1.1" -modelscope = "^1.18.1" -peft = "0.13.2" +dependencies = [ + "dora-rs >= 0.3.6", + "numpy < 2.0.0", + "torch >= 2.2.0", + "torchvision >= 0.20", + "transformers >= 4.45", + "qwen-vl-utils >= 0.0.2", + "accelerate >= 0.33", + "opencv-python >= 4.1.1", + "modelscope >= 1.18.1", + "peft = 0.13.2", +] + # flash_attn = "^2.6.1" # Install using: pip install -U flash-attn --no-build-isolation diff --git a/node-hub/dora-rdt-1b/pyproject.toml b/node-hub/dora-rdt-1b/pyproject.toml index d8912add3..94a85dd84 100644 --- a/node-hub/dora-rdt-1b/pyproject.toml +++ b/node-hub/dora-rdt-1b/pyproject.toml @@ -6,31 +6,31 @@ description = "Dora Node for RDT 1B" readme = "README.md" -[tool.poetry.dependencies] -python = "^3.7" -dora-rs = "^0.3.6" -numpy = "< 2.0.0" -torch = "^2.4.0" -torchvision = "^0.19" -transformers = "^4.45" -qwen-vl-utils = "^0.0.2" -accelerate = "^0.33" -opencv-python = ">= 4.1.1" -modelscope = "^1.18.1" -packaging = "24.0" -wandb = "0.17.0" -diffusers = "0.27.2" -timm = "1.0.3" -sentencepiece = "0.2.0" -h5py = "3.11.0" -imgaug = "0.4.0" -huggingface_hub = "0.23.5" +dependencies = [ + "dora-rs >= 0.3.6", + "numpy < 2.0.0", + "torch >= 2.4.0", + "torchvision >= 0.19", + "transformers >= 4.45", + "qwen-vl-utils >= 0.0.2", + "accelerate >= 0.33", + "opencv-python >= 4.1.1", + "modelscope >= 1.18.1", + "packaging = 24.0", + "wandb =0.17.0", + "diffusers =0.27.2", + "timm =1.0.3", + "sentencepiece =0.2.0", + "h5py =3.11.0", + "imgaug =0.4.0", + "huggingface_hub = 0.23.5", +] + # flash_attn = "^2.6.1" # Install using: pip install -U flash-attn --no-build-isolation [dependency-groups] dev = ["pytest >=8.1.1", "ruff >=0.9.1"] -ruff = ">= 0.9.1" [tool.black] extend-exclude = 'dora_rdt_1b/RoboticsDiffusionTransformer' diff --git a/node-hub/dora-ugv/pyproject.toml b/node-hub/dora-ugv/pyproject.toml index 346beb920..4846ab58e 100644 --- a/node-hub/dora-ugv/pyproject.toml +++ b/node-hub/dora-ugv/pyproject.toml @@ -6,9 +6,7 @@ description = "Dora Node for using Agilex UGV" readme = "README.md" -[tool.poetry.dependencies] -dora-rs = "^0.3.6" -python = "^3.7" +dependencies = ["dora-rs >= 0.3.6", "python >= 3.7"] [project.scripts] diff --git a/node-hub/dora-vad/pyproject.toml b/node-hub/dora-vad/pyproject.toml index 7d9386362..06062f1de 100644 --- a/node-hub/dora-vad/pyproject.toml +++ b/node-hub/dora-vad/pyproject.toml @@ -6,11 +6,7 @@ readme = "README.md" authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] -[tool.poetry.dependencies] -dora-rs = "^0.3.6" -numpy = "< 2.0.0" -python = "^3.7" -silero-vad = "^5.1" +dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "silero-vad >= 5.1"] [project.scripts] diff --git a/node-hub/dora-yolo/pyproject.toml b/node-hub/dora-yolo/pyproject.toml index e4dcf8e19..97c46d6f0 100644 --- a/node-hub/dora-yolo/pyproject.toml +++ b/node-hub/dora-yolo/pyproject.toml @@ -9,11 +9,7 @@ description = "Dora Node for object detection with dora YOLOv8" readme = "README.md" -[tool.poetry.dependencies] -dora-rs = "^0.3.6" -numpy = "< 2.0.0" -ultralytics = "^8.3.24" -python = "^3.7" +dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "ultralytics >= 8.3.24"] [project.scripts] dora-yolo = "dora_yolo.main:main" diff --git a/node-hub/llama-factory-recorder/pyproject.toml b/node-hub/llama-factory-recorder/pyproject.toml index 0fdc7a6f5..ac75cd43e 100644 --- a/node-hub/llama-factory-recorder/pyproject.toml +++ b/node-hub/llama-factory-recorder/pyproject.toml @@ -9,11 +9,12 @@ description = "Dora Node for VLM" readme = "README.md" -[tool.poetry.dependencies] -python = "^3.7" -dora-rs = "^0.3.6" -pillow = "^10.4.0" -opencv-python = ">= 4.1.1" +dependencies = [ + + "dora-rs >= 0.3.6", + "pillow >= 10.4.0", + "opencv-python >= 4.1.1", +] [project.scripts] llama-factory-recorder = "llama_factory_recorder.main:main" diff --git a/node-hub/opencv-plot/pyproject.toml b/node-hub/opencv-plot/pyproject.toml index 98b5adaba..599b97a49 100644 --- a/node-hub/opencv-plot/pyproject.toml +++ b/node-hub/opencv-plot/pyproject.toml @@ -9,11 +9,7 @@ description = "Dora Node for plotting text and bbox on image with OpenCV" readme = "README.md" -[tool.poetry.dependencies] -dora-rs = "^0.3.6" -numpy = "< 2.0.0" -opencv-python = ">= 4.1.1" -python = "^3.7" +dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "opencv-python >= 4.1.1"] [project.scripts] opencv-plot = "opencv_plot.main:main" diff --git a/node-hub/opencv-video-capture/pyproject.toml b/node-hub/opencv-video-capture/pyproject.toml index b208d7cec..c549ac83e 100644 --- a/node-hub/opencv-video-capture/pyproject.toml +++ b/node-hub/opencv-video-capture/pyproject.toml @@ -9,11 +9,7 @@ description = "Dora Node for capturing video with OpenCV" readme = "README.md" -[tool.poetry.dependencies] -dora-rs = "^0.3.6" -numpy = "< 2.0.0" -opencv-python = ">= 4.1.1" -python = "^3.7" +dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "opencv-python >= 4.1.1"] [project.scripts] opencv-video-capture = "opencv_video_capture.main:main" diff --git a/node-hub/pyarrow-assert/pyproject.toml b/node-hub/pyarrow-assert/pyproject.toml index dd4ca6a3e..c25025ebc 100644 --- a/node-hub/pyarrow-assert/pyproject.toml +++ b/node-hub/pyarrow-assert/pyproject.toml @@ -9,11 +9,7 @@ authors = [ description = "Dora Node for plotting text and bbox on image with OpenCV" license = "MIT License" -[tool.poetry.dependencies] -dora-rs = "^0.3.6" -numpy = "< 2.0.0" -pyarrow = ">= 5.0.0" -python = "^3.7" +dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "pyarrow >= 5.0.0"] [project.scripts] pyarrow-assert = "pyarrow_assert.main:main" diff --git a/node-hub/pyarrow-sender/pyproject.toml b/node-hub/pyarrow-sender/pyproject.toml index ce08e8660..73f6be05c 100644 --- a/node-hub/pyarrow-sender/pyproject.toml +++ b/node-hub/pyarrow-sender/pyproject.toml @@ -10,11 +10,7 @@ license = "MIT License" readme = "README.md" -[tool.poetry.dependencies] -dora-rs = "^0.3.6" -numpy = "< 2.0.0" -pyarrow = ">= 5.0.0" -python = "^3.7" +dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "pyarrow >= 5.0.0"] [project.scripts] pyarrow-sender = "pyarrow_sender.main:main" diff --git a/node-hub/terminal-input/pyproject.toml b/node-hub/terminal-input/pyproject.toml index 04f52b11f..7a27c145b 100644 --- a/node-hub/terminal-input/pyproject.toml +++ b/node-hub/terminal-input/pyproject.toml @@ -10,11 +10,7 @@ license = "MIT License" readme = "README.md" -[tool.poetry.dependencies] -dora-rs = "^0.3.6" -numpy = "< 2.0.0" -pyarrow = ">= 5.0.0" -python = "^3.7" +dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "pyarrow >= 5.0.0"] [project.scripts] terminal-input = "terminal_input.main:main" From 1f15484d0df315e16dc219da8578681035d6e216 Mon Sep 17 00:00:00 2001 From: haixuantao Date: Fri, 17 Jan 2025 13:33:25 +0100 Subject: [PATCH 08/17] Remove ruff and pytest from CI/CD and makes them dev dependencies of each node --- .github/workflows/node-hub-ci-cd.yml | 1 - .../cli/src/template/python/__node-name__/pyproject.toml | 2 +- node-hub/dora-argotranslate/pyproject.toml | 3 +++ node-hub/dora-distil-whisper/pyproject.toml | 6 +++--- node-hub/dora-internvl/pyproject.toml | 3 +++ node-hub/dora-keyboard/pyproject.toml | 3 +++ node-hub/dora-microphone/pyproject.toml | 3 +++ node-hub/dora-openai-server/pyproject.toml | 3 +++ node-hub/dora-opus/pyproject.toml | 3 +++ node-hub/dora-outtetts/pyproject.toml | 2 +- node-hub/dora-parler/pyproject.toml | 3 +++ node-hub/dora-pyaudio/pyproject.toml | 3 +-- node-hub/dora-pyorbbecksdk/pyproject.toml | 3 +++ node-hub/dora-pyrealsense/pyproject.toml | 3 +++ node-hub/dora-qwenvl/pyproject.toml | 3 +++ node-hub/dora-rdt-1b/pyproject.toml | 6 +++--- node-hub/dora-ugv/pyproject.toml | 3 +++ node-hub/dora-vad/pyproject.toml | 3 +++ node-hub/dora-yolo/pyproject.toml | 3 +++ node-hub/llama-factory-recorder/pyproject.toml | 4 +++- node-hub/opencv-plot/pyproject.toml | 3 +++ node-hub/opencv-video-capture/pyproject.toml | 3 +++ node-hub/pyarrow-assert/pyproject.toml | 3 +++ node-hub/pyarrow-sender/pyproject.toml | 3 +++ node-hub/terminal-input/pyproject.toml | 3 +++ 25 files changed, 66 insertions(+), 12 deletions(-) diff --git a/.github/workflows/node-hub-ci-cd.yml b/.github/workflows/node-hub-ci-cd.yml index 2eb6b41ba..dd02e7141 100644 --- a/.github/workflows/node-hub-ci-cd.yml +++ b/.github/workflows/node-hub-ci-cd.yml @@ -86,7 +86,6 @@ jobs: run: | curl -LsSf https://astral.sh/uv/install.sh | sh echo "$HOME/.local/bin" >> $GITHUB_PATH - uv pip install ruff pytest - name: Set up Rust if: runner.os == 'Linux' || github.event_name == 'workflow_dispatch' || (github.event_name == 'release' && startsWith(github.ref, 'refs/tags/')) diff --git a/binaries/cli/src/template/python/__node-name__/pyproject.toml b/binaries/cli/src/template/python/__node-name__/pyproject.toml index 77249693f..a4c85c935 100644 --- a/binaries/cli/src/template/python/__node-name__/pyproject.toml +++ b/binaries/cli/src/template/python/__node-name__/pyproject.toml @@ -10,7 +10,7 @@ readme = "README.md" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "pyarrow >= 15.0.0"] [dependency-groups] -dev = ["pytest >=8.1.1,<9", "ruff >=0.9.1"] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] __node-name__ = "__node_name__.main:main" diff --git a/node-hub/dora-argotranslate/pyproject.toml b/node-hub/dora-argotranslate/pyproject.toml index 631fb6b44..c177aa72a 100644 --- a/node-hub/dora-argotranslate/pyproject.toml +++ b/node-hub/dora-argotranslate/pyproject.toml @@ -12,6 +12,9 @@ authors = [ dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "argostranslate >= 1.9.6"] +[dependency-groups] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] + [project.scripts] dora-argotranslate = "dora_argotranslate.main:main" diff --git a/node-hub/dora-distil-whisper/pyproject.toml b/node-hub/dora-distil-whisper/pyproject.toml index 85454e700..41ef580b9 100644 --- a/node-hub/dora-distil-whisper/pyproject.toml +++ b/node-hub/dora-distil-whisper/pyproject.toml @@ -22,12 +22,12 @@ dependencies = [ ] -[project.scripts] -dora-distil-whisper = "dora_distil_whisper.main:main" - [dependency-groups] dev = ["pytest >=8.1.1", "ruff >=0.9.1"] +[project.scripts] +dora-distil-whisper = "dora_distil_whisper.main:main" + [build-system] requires = ["poetry-core>=1.8.0"] build-backend = "poetry.core.masonry.api" diff --git a/node-hub/dora-internvl/pyproject.toml b/node-hub/dora-internvl/pyproject.toml index 45d4a63d3..bf37b48c8 100644 --- a/node-hub/dora-internvl/pyproject.toml +++ b/node-hub/dora-internvl/pyproject.toml @@ -24,6 +24,9 @@ dependencies = [ "sentencepiece >= 0.1.99", ] +[dependency-groups] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] + [project.scripts] dora-internvl = "dora_internvl.main:main" diff --git a/node-hub/dora-keyboard/pyproject.toml b/node-hub/dora-keyboard/pyproject.toml index 9225edbf0..cdf83d610 100644 --- a/node-hub/dora-keyboard/pyproject.toml +++ b/node-hub/dora-keyboard/pyproject.toml @@ -16,6 +16,9 @@ dependencies = [ ] +[dependency-groups] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] + [project.scripts] dora-keyboard = "dora_keyboard.main:main" diff --git a/node-hub/dora-microphone/pyproject.toml b/node-hub/dora-microphone/pyproject.toml index 9c71f31f1..ee079098a 100644 --- a/node-hub/dora-microphone/pyproject.toml +++ b/node-hub/dora-microphone/pyproject.toml @@ -16,6 +16,9 @@ dependencies = [ ] +[dependency-groups] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] + [project.scripts] dora-microphone = "dora_microphone.main:main" diff --git a/node-hub/dora-openai-server/pyproject.toml b/node-hub/dora-openai-server/pyproject.toml index 2e729164c..8d3f2325c 100644 --- a/node-hub/dora-openai-server/pyproject.toml +++ b/node-hub/dora-openai-server/pyproject.toml @@ -19,6 +19,9 @@ dependencies = [ "pydantic >= 2.9", ] +[dependency-groups] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] + [project.scripts] dora-openai-server = "dora_openai_server.main:main" diff --git a/node-hub/dora-opus/pyproject.toml b/node-hub/dora-opus/pyproject.toml index 080b356e8..6f28033b5 100644 --- a/node-hub/dora-opus/pyproject.toml +++ b/node-hub/dora-opus/pyproject.toml @@ -20,6 +20,9 @@ dependencies = [ "torch >= 2.2.0", ] +[dependency-groups] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] + [project.scripts] dora-opus = "dora_opus.main:main" diff --git a/node-hub/dora-outtetts/pyproject.toml b/node-hub/dora-outtetts/pyproject.toml index c8f0a087a..c8980ae90 100644 --- a/node-hub/dora-outtetts/pyproject.toml +++ b/node-hub/dora-outtetts/pyproject.toml @@ -17,7 +17,7 @@ dependencies = [ ] [dependency-groups] -dev = ["pytest >=8.1.1,<9"] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] dora-outtetts = "dora_outtetts.main:main" diff --git a/node-hub/dora-parler/pyproject.toml b/node-hub/dora-parler/pyproject.toml index 2fa4116a6..30919bdef 100644 --- a/node-hub/dora-parler/pyproject.toml +++ b/node-hub/dora-parler/pyproject.toml @@ -23,6 +23,9 @@ dependencies = [ [tool.uv.sources] parler_tts = { git = "https://github.com/huggingface/parler-tts.git" } +[dependency-groups] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] + [project.scripts] dora-parler = "dora_parler.main:main" diff --git a/node-hub/dora-pyaudio/pyproject.toml b/node-hub/dora-pyaudio/pyproject.toml index 7c61bda52..e622862cb 100644 --- a/node-hub/dora-pyaudio/pyproject.toml +++ b/node-hub/dora-pyaudio/pyproject.toml @@ -15,8 +15,7 @@ dependencies = [ ] [dependency-groups] -dev = ["pytest >=8.1.1,<9"] - +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] dora-pyaudio = "dora_pyaudio.main:main" diff --git a/node-hub/dora-pyorbbecksdk/pyproject.toml b/node-hub/dora-pyorbbecksdk/pyproject.toml index b20338168..ea66c6bc0 100644 --- a/node-hub/dora-pyorbbecksdk/pyproject.toml +++ b/node-hub/dora-pyorbbecksdk/pyproject.toml @@ -12,6 +12,9 @@ readme = "README.md" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "opencv-python >= 4.1.1"] +[dependency-groups] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] + [project.scripts] dora-pyorbbecksdk = "dora_pyorbbecksdk.main:main" diff --git a/node-hub/dora-pyrealsense/pyproject.toml b/node-hub/dora-pyrealsense/pyproject.toml index 189cb018d..6903046b8 100644 --- a/node-hub/dora-pyrealsense/pyproject.toml +++ b/node-hub/dora-pyrealsense/pyproject.toml @@ -14,6 +14,9 @@ dependencies = [ "pyrealsense2 = '2.54.1.5216'; sys_platform == 'linux'", "pyrealsense2 = '2.54.1.5216'; sys_platform == 'windows'", ] +[dependency-groups] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] + [project.scripts] dora-pyrealsense = "dora_pyrealsense.main:main" diff --git a/node-hub/dora-qwenvl/pyproject.toml b/node-hub/dora-qwenvl/pyproject.toml index ce496ae89..25d3d2a9d 100644 --- a/node-hub/dora-qwenvl/pyproject.toml +++ b/node-hub/dora-qwenvl/pyproject.toml @@ -25,6 +25,9 @@ dependencies = [ # flash_attn = "^2.6.1" # Install using: pip install -U flash-attn --no-build-isolation +[dependency-groups] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] + [project.scripts] dora-qwenvl = "dora_qwenvl.main:main" diff --git a/node-hub/dora-rdt-1b/pyproject.toml b/node-hub/dora-rdt-1b/pyproject.toml index 94a85dd84..541828678 100644 --- a/node-hub/dora-rdt-1b/pyproject.toml +++ b/node-hub/dora-rdt-1b/pyproject.toml @@ -29,13 +29,13 @@ dependencies = [ # flash_attn = "^2.6.1" # Install using: pip install -U flash-attn --no-build-isolation -[dependency-groups] -dev = ["pytest >=8.1.1", "ruff >=0.9.1"] - [tool.black] extend-exclude = 'dora_rdt_1b/RoboticsDiffusionTransformer' +[dependency-groups] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] + [project.scripts] dora-rdt-1b = "dora_rdt_1b.main:main" diff --git a/node-hub/dora-ugv/pyproject.toml b/node-hub/dora-ugv/pyproject.toml index 4846ab58e..86daff72b 100644 --- a/node-hub/dora-ugv/pyproject.toml +++ b/node-hub/dora-ugv/pyproject.toml @@ -9,6 +9,9 @@ readme = "README.md" dependencies = ["dora-rs >= 0.3.6", "python >= 3.7"] +[dependency-groups] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] + [project.scripts] dora-ugv = "dora_ugv.main:main" diff --git a/node-hub/dora-vad/pyproject.toml b/node-hub/dora-vad/pyproject.toml index 06062f1de..044e53a4c 100644 --- a/node-hub/dora-vad/pyproject.toml +++ b/node-hub/dora-vad/pyproject.toml @@ -9,6 +9,9 @@ authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "silero-vad >= 5.1"] +[dependency-groups] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] + [project.scripts] dora-vad = "dora_vad.main:main" diff --git a/node-hub/dora-yolo/pyproject.toml b/node-hub/dora-yolo/pyproject.toml index 97c46d6f0..e96cffc37 100644 --- a/node-hub/dora-yolo/pyproject.toml +++ b/node-hub/dora-yolo/pyproject.toml @@ -11,6 +11,9 @@ readme = "README.md" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "ultralytics >= 8.3.24"] +[dependency-groups] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] + [project.scripts] dora-yolo = "dora_yolo.main:main" diff --git a/node-hub/llama-factory-recorder/pyproject.toml b/node-hub/llama-factory-recorder/pyproject.toml index ac75cd43e..4a2730bca 100644 --- a/node-hub/llama-factory-recorder/pyproject.toml +++ b/node-hub/llama-factory-recorder/pyproject.toml @@ -10,12 +10,14 @@ readme = "README.md" dependencies = [ - "dora-rs >= 0.3.6", "pillow >= 10.4.0", "opencv-python >= 4.1.1", ] +[dependency-groups] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] + [project.scripts] llama-factory-recorder = "llama_factory_recorder.main:main" diff --git a/node-hub/opencv-plot/pyproject.toml b/node-hub/opencv-plot/pyproject.toml index 599b97a49..c1a095420 100644 --- a/node-hub/opencv-plot/pyproject.toml +++ b/node-hub/opencv-plot/pyproject.toml @@ -11,6 +11,9 @@ readme = "README.md" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "opencv-python >= 4.1.1"] +[dependency-groups] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] + [project.scripts] opencv-plot = "opencv_plot.main:main" diff --git a/node-hub/opencv-video-capture/pyproject.toml b/node-hub/opencv-video-capture/pyproject.toml index c549ac83e..e5e18a802 100644 --- a/node-hub/opencv-video-capture/pyproject.toml +++ b/node-hub/opencv-video-capture/pyproject.toml @@ -11,6 +11,9 @@ readme = "README.md" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "opencv-python >= 4.1.1"] +[dependency-groups] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] + [project.scripts] opencv-video-capture = "opencv_video_capture.main:main" diff --git a/node-hub/pyarrow-assert/pyproject.toml b/node-hub/pyarrow-assert/pyproject.toml index c25025ebc..5ec2ef801 100644 --- a/node-hub/pyarrow-assert/pyproject.toml +++ b/node-hub/pyarrow-assert/pyproject.toml @@ -11,6 +11,9 @@ license = "MIT License" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "pyarrow >= 5.0.0"] +[dependency-groups] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] + [project.scripts] pyarrow-assert = "pyarrow_assert.main:main" diff --git a/node-hub/pyarrow-sender/pyproject.toml b/node-hub/pyarrow-sender/pyproject.toml index 73f6be05c..d5ff5d316 100644 --- a/node-hub/pyarrow-sender/pyproject.toml +++ b/node-hub/pyarrow-sender/pyproject.toml @@ -12,6 +12,9 @@ readme = "README.md" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "pyarrow >= 5.0.0"] +[dependency-groups] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] + [project.scripts] pyarrow-sender = "pyarrow_sender.main:main" diff --git a/node-hub/terminal-input/pyproject.toml b/node-hub/terminal-input/pyproject.toml index 7a27c145b..92ae02fbd 100644 --- a/node-hub/terminal-input/pyproject.toml +++ b/node-hub/terminal-input/pyproject.toml @@ -12,6 +12,9 @@ readme = "README.md" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "pyarrow >= 5.0.0"] +[dependency-groups] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] + [project.scripts] terminal-input = "terminal_input.main:main" From d82b699674b85809f06e5b0bbee0b4171067ecf1 Mon Sep 17 00:00:00 2001 From: haixuantao Date: Fri, 17 Jan 2025 13:49:24 +0100 Subject: [PATCH 09/17] Fix CI/CD --- node-hub/README.md | 9 +++------ node-hub/dora-outtetts/pyproject.toml | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/node-hub/README.md b/node-hub/README.md index 408e64403..d3eb84618 100644 --- a/node-hub/README.md +++ b/node-hub/README.md @@ -65,14 +65,11 @@ authors = [ description = "Dora Node for plotting data with OpenCV" readme = "README.md" -packages = [ - { include = "main.py", to = "opencv_plot" } -] - dependencies = [ -"dora-rs = ^0.3.8", - + "dora-rs >= 0.3.8", ] +[dependency-groups] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] opencv-plot = "opencv_plot.main:main" diff --git a/node-hub/dora-outtetts/pyproject.toml b/node-hub/dora-outtetts/pyproject.toml index c8980ae90..4b8893948 100644 --- a/node-hub/dora-outtetts/pyproject.toml +++ b/node-hub/dora-outtetts/pyproject.toml @@ -13,7 +13,7 @@ dependencies = [ "pyarrow >= 5.0.0", "python >= 3.10", "outetts >= 0.2.3", - "llama-cpp-python = ^0.3.5", + "llama-cpp-python >= 0.3.5", ] [dependency-groups] From d3fdbf5e0a9b4702c846650adde0facccf849d2d Mon Sep 17 00:00:00 2001 From: haixuantao Date: Fri, 17 Jan 2025 13:50:03 +0100 Subject: [PATCH 10/17] Minor python esthetics --- apis/python/node/dora/__init__.py | 15 +++++++------- apis/python/node/dora/cuda.py | 22 ++++++++------------- apis/python/node/pyproject.toml | 5 ++++- node-hub/dora-distil-whisper/pyproject.toml | 2 +- 4 files changed, 21 insertions(+), 23 deletions(-) diff --git a/apis/python/node/dora/__init__.py b/apis/python/node/dora/__init__.py index 354d9ad40..a574bef66 100644 --- a/apis/python/node/dora/__init__.py +++ b/apis/python/node/dora/__init__.py @@ -10,30 +10,31 @@ from enum import Enum from .dora import * - from .dora import ( Node, Ros2Context, + Ros2Durability, + Ros2Liveliness, Ros2Node, Ros2NodeOptions, - Ros2Topic, Ros2Publisher, + Ros2QosPolicies, Ros2Subscription, - start_runtime, - __version__, + Ros2Topic, __author__, - Ros2QosPolicies, - Ros2Durability, - Ros2Liveliness, + __version__, + start_runtime, ) class DoraStatus(Enum): """Dora status to indicate if operator `on_input` loop should be stopped. + Args: Enum (u8): Status signaling to dora operator to stop or continue the operator. + """ CONTINUE = 0 diff --git a/apis/python/node/dora/cuda.py b/apis/python/node/dora/cuda.py index 1858a7bbe..fdd6fba73 100644 --- a/apis/python/node/dora/cuda.py +++ b/apis/python/node/dora/cuda.py @@ -1,19 +1,18 @@ import pyarrow as pa -# To install pyarrow.cuda, run `conda install pyarrow "arrow-cpp-proc=*=cuda" -c conda-forge` -import pyarrow.cuda as cuda - # Make sure to install torch with cuda import torch +from numba.cuda import to_device # Make sure to install numba with cuda from numba.cuda.cudadrv.devicearray import DeviceNDArray -from numba.cuda import to_device + +# To install pyarrow.cuda, run `conda install pyarrow "arrow-cpp-proc=*=cuda" -c conda-forge` +from pyarrow import cuda def torch_to_ipc_buffer(tensor: torch.TensorType) -> tuple[pa.array, dict]: - """ - Converts a Pytorch tensor into a pyarrow buffer containing the IPC handle and its metadata. + """Converts a Pytorch tensor into a pyarrow buffer containing the IPC handle and its metadata. Example Use: ```python @@ -34,8 +33,7 @@ def torch_to_ipc_buffer(tensor: torch.TensorType) -> tuple[pa.array, dict]: def ipc_buffer_to_ipc_handle(handle_buffer: pa.array) -> cuda.IpcMemHandle: - """ - Converts a buffer containing a serialized handler into cuda IPC MemHandle. + """Converts a buffer containing a serialized handler into cuda IPC MemHandle. example use: ```python @@ -57,8 +55,7 @@ def ipc_buffer_to_ipc_handle(handle_buffer: pa.array) -> cuda.IpcMemHandle: def cudabuffer_to_numba(buffer: cuda.CudaBuffer, metadata: dict) -> DeviceNDArray: - """ - Converts a pyarrow CUDA buffer to numba. + """Converts a pyarrow CUDA buffer to numba. example use: ```python @@ -74,7 +71,6 @@ def cudabuffer_to_numba(buffer: cuda.CudaBuffer, metadata: dict) -> DeviceNDArra numba_tensor = cudabuffer_to_numbda(cudabuffer, event["metadata"]) ``` """ - shape = metadata["shape"] strides = metadata["strides"] dtype = metadata["dtype"] @@ -83,8 +79,7 @@ def cudabuffer_to_numba(buffer: cuda.CudaBuffer, metadata: dict) -> DeviceNDArra def cudabuffer_to_torch(buffer: cuda.CudaBuffer, metadata: dict) -> torch.Tensor: - """ - Converts a pyarrow CUDA buffer to a torch tensor. + """Converts a pyarrow CUDA buffer to a torch tensor. example use: ```python @@ -100,7 +95,6 @@ def cudabuffer_to_torch(buffer: cuda.CudaBuffer, metadata: dict) -> torch.Tensor torch_tensor = cudabuffer_to_torch(cudabuffer, event["metadata"]) # on cuda ``` """ - device_arr = cudabuffer_to_numba(buffer, metadata) torch_tensor = torch.as_tensor(device_arr, device="cuda") return torch_tensor diff --git a/apis/python/node/pyproject.toml b/apis/python/node/pyproject.toml index d1f79b9c3..35c0ace5f 100644 --- a/apis/python/node/pyproject.toml +++ b/apis/python/node/pyproject.toml @@ -4,9 +4,12 @@ build-backend = "maturin" [project] name = "dora-rs" -dynamic = ["version"] +dynamic = ["version", "readme"] # Install pyarrow at the same time of dora-rs dependencies = ['pyarrow'] +[dependency-groups] +dev = ["pytest >=8.1.1", "ruff >=0.9.1"] + [tool.maturin] features = ["pyo3/extension-module"] diff --git a/node-hub/dora-distil-whisper/pyproject.toml b/node-hub/dora-distil-whisper/pyproject.toml index 41ef580b9..2a24ad581 100644 --- a/node-hub/dora-distil-whisper/pyproject.toml +++ b/node-hub/dora-distil-whisper/pyproject.toml @@ -18,7 +18,7 @@ dependencies = [ "accelerate >= 0.29.2", "torch >= 2.2.0", "modelscope >= 1.18.1", - "lightning-whisper-mlx =^0.0.10; sys_platform == darwin", + "lightning-whisper-mlx >= 0.0.10; sys_platform == darwin", ] From 9e3142d086a1b97ace727bf38559e99b0927f5ac Mon Sep 17 00:00:00 2001 From: haixuantao Date: Fri, 17 Jan 2025 14:28:16 +0100 Subject: [PATCH 11/17] Fix license and readme and requires-python --- apis/python/node/pyproject.toml | 5 ++++- binaries/cli/pyproject.toml | 4 +++- .../src/template/python/__node-name__/pyproject.toml | 4 ++-- node-hub/README.md | 2 ++ node-hub/dora-argotranslate/pyproject.toml | 5 +++-- node-hub/dora-distil-whisper/pyproject.toml | 4 ++-- node-hub/dora-echo/pyproject.toml | 4 +++- node-hub/dora-internvl/pyproject.toml | 3 ++- node-hub/dora-keyboard/pyproject.toml | 4 +++- node-hub/dora-kit-car/pyproject.toml | 2 ++ node-hub/dora-microphone/pyproject.toml | 4 +++- node-hub/dora-openai-server/pyproject.toml | 4 +++- node-hub/dora-opus/pyproject.toml | 4 +++- node-hub/dora-outtetts/pyproject.toml | 4 ++-- node-hub/dora-parler/pyproject.toml | 3 ++- node-hub/dora-piper/pyproject.toml | 3 ++- node-hub/dora-pyaudio/pyproject.toml | 12 ++++-------- node-hub/dora-pyorbbecksdk/pyproject.toml | 3 ++- node-hub/dora-pyrealsense/pyproject.toml | 3 ++- node-hub/dora-qwenvl/pyproject.toml | 3 ++- node-hub/dora-rdt-1b/pyproject.toml | 3 ++- node-hub/dora-ugv/pyproject.toml | 3 ++- node-hub/dora-vad/pyproject.toml | 5 +++-- node-hub/dora-yolo/pyproject.toml | 3 ++- node-hub/llama-factory-recorder/pyproject.toml | 3 ++- node-hub/opencv-plot/pyproject.toml | 3 ++- node-hub/opencv-video-capture/pyproject.toml | 3 ++- node-hub/pyarrow-assert/pyproject.toml | 6 ++++-- node-hub/pyarrow-sender/pyproject.toml | 6 ++++-- node-hub/terminal-input/pyproject.toml | 4 +++- 30 files changed, 77 insertions(+), 42 deletions(-) diff --git a/apis/python/node/pyproject.toml b/apis/python/node/pyproject.toml index 35c0ace5f..1cbc74cae 100644 --- a/apis/python/node/pyproject.toml +++ b/apis/python/node/pyproject.toml @@ -4,8 +4,11 @@ build-backend = "maturin" [project] name = "dora-rs" -dynamic = ["version", "readme"] +dynamic = ["version"] # Install pyarrow at the same time of dora-rs +requires-python = ">=3.7" +license = { text = "MIT" } +readme = "README.md" dependencies = ['pyarrow'] [dependency-groups] diff --git a/binaries/cli/pyproject.toml b/binaries/cli/pyproject.toml index 295e9bc10..8347841f9 100644 --- a/binaries/cli/pyproject.toml +++ b/binaries/cli/pyproject.toml @@ -5,8 +5,10 @@ build-backend = "maturin" [project] name = "dora-rs-cli" dynamic = ["version"] - scripts = { "dora" = "dora_cli:py_main" } +license = { text = "MIT" } +readme = "README.md" +requires-python = ">=3.7" dependencies = ['dora-rs'] [tool.maturin] diff --git a/binaries/cli/src/template/python/__node-name__/pyproject.toml b/binaries/cli/src/template/python/__node-name__/pyproject.toml index a4c85c935..181e3c0af 100644 --- a/binaries/cli/src/template/python/__node-name__/pyproject.toml +++ b/binaries/cli/src/template/python/__node-name__/pyproject.toml @@ -3,9 +3,9 @@ name = "__node-name__" version = "0.0.0" authors = [{ name = "Your Name", email = "email@email.com" }] description = "Node Name" -license = "MIT License" +license = { text = "MIT" } readme = "README.md" - +requires-python = ">=3.7" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "pyarrow >= 15.0.0"] diff --git a/node-hub/README.md b/node-hub/README.md index d3eb84618..da969eaff 100644 --- a/node-hub/README.md +++ b/node-hub/README.md @@ -64,6 +64,8 @@ authors = [ ] description = "Dora Node for plotting data with OpenCV" readme = "README.md" +license = { text = "MIT" } +requires-python = ">=3.7" dependencies = [ "dora-rs >= 0.3.8", diff --git a/node-hub/dora-argotranslate/pyproject.toml b/node-hub/dora-argotranslate/pyproject.toml index c177aa72a..69c7d517d 100644 --- a/node-hub/dora-argotranslate/pyproject.toml +++ b/node-hub/dora-argotranslate/pyproject.toml @@ -2,13 +2,14 @@ name = "dora-argotranslate" version = "0.3.8" description = "Dora Node for Text translating using Argostranslate" -readme = "README.md" authors = [ { name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }, { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, { name = "Félix Huang", email = "felix.huang.net@gmail.com" }, ] - +license = { text = "MIT" } +readme = "README.md" +requires-python = ">=3.7" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "argostranslate >= 1.9.6"] diff --git a/node-hub/dora-distil-whisper/pyproject.toml b/node-hub/dora-distil-whisper/pyproject.toml index 2a24ad581..3de59748e 100644 --- a/node-hub/dora-distil-whisper/pyproject.toml +++ b/node-hub/dora-distil-whisper/pyproject.toml @@ -6,9 +6,9 @@ authors = [ { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora dora-distil-whisper" -license = "MIT License" +license = { text = "MIT" } readme = "README.md" - +requires-python = ">=3.7" dependencies = [ "dora-rs >= 0.3.6", diff --git a/node-hub/dora-echo/pyproject.toml b/node-hub/dora-echo/pyproject.toml index 15338f2f4..b24f6e3dd 100644 --- a/node-hub/dora-echo/pyproject.toml +++ b/node-hub/dora-echo/pyproject.toml @@ -6,7 +6,9 @@ authors = [ { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora echo" -license = "MIT License" +license = { text = "MIT" } +readme = "README.md" +requires-python = ">=3.7" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "pyarrow >= 5.0.0"] diff --git a/node-hub/dora-internvl/pyproject.toml b/node-hub/dora-internvl/pyproject.toml index bf37b48c8..22e764adb 100644 --- a/node-hub/dora-internvl/pyproject.toml +++ b/node-hub/dora-internvl/pyproject.toml @@ -6,8 +6,9 @@ authors = [ { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora Node for VLM" +license = { text = "MIT" } readme = "README.md" - +requires-python = ">=3.7" dependencies = [ diff --git a/node-hub/dora-keyboard/pyproject.toml b/node-hub/dora-keyboard/pyproject.toml index cdf83d610..9af4a8421 100644 --- a/node-hub/dora-keyboard/pyproject.toml +++ b/node-hub/dora-keyboard/pyproject.toml @@ -6,7 +6,9 @@ authors = [ { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora dora-keyboard" -license = "MIT License" +license = { text = "MIT" } +readme = "README.md" +requires-python = ">=3.7" dependencies = [ "dora-rs >= 0.3.6", diff --git a/node-hub/dora-kit-car/pyproject.toml b/node-hub/dora-kit-car/pyproject.toml index 5c42027aa..1bd1f4d1e 100644 --- a/node-hub/dora-kit-car/pyproject.toml +++ b/node-hub/dora-kit-car/pyproject.toml @@ -7,7 +7,9 @@ name = "dora-kit-car" dynamic = ["version"] authors = [{ name = "Leon", email = "echo_ai@foxmail.com" }] description = "Dora Node for dora kit car" +license = { text = "MIT" } readme = "README.md" +requires-python = ">=3.7" scripts = { "dora-kit-car" = "dora_kit_car:py_main" } diff --git a/node-hub/dora-microphone/pyproject.toml b/node-hub/dora-microphone/pyproject.toml index ee079098a..e71ec93de 100644 --- a/node-hub/dora-microphone/pyproject.toml +++ b/node-hub/dora-microphone/pyproject.toml @@ -6,7 +6,9 @@ authors = [ { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora dora-microphone" -license = "MIT License" +license = { text = "MIT" } +readme = "README.md" +requires-python = ">=3.7" dependencies = [ "dora-rs >= 0.3.6", diff --git a/node-hub/dora-openai-server/pyproject.toml b/node-hub/dora-openai-server/pyproject.toml index 8d3f2325c..c4fddeb45 100644 --- a/node-hub/dora-openai-server/pyproject.toml +++ b/node-hub/dora-openai-server/pyproject.toml @@ -6,7 +6,9 @@ authors = [ { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora OpenAI API Server" -license = "MIT License" +license = { text = "MIT" } +readme = "README.md" +requires-python = ">=3.7" dependencies = [ "dora-rs >= 0.3.6", diff --git a/node-hub/dora-opus/pyproject.toml b/node-hub/dora-opus/pyproject.toml index 6f28033b5..fe4492fc2 100644 --- a/node-hub/dora-opus/pyproject.toml +++ b/node-hub/dora-opus/pyproject.toml @@ -2,13 +2,15 @@ name = "dora-opus" version = "0.3.8" description = "Dora Node for Text translating using Opus" -readme = "README.md" authors = [ { name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }, { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, { name = "Félix Huang", email = "felix.huang.net@gmail.com" }, ] +license = { text = "MIT" } +readme = "README.md" +requires-python = ">=3.7" dependencies = [ "dora-rs >= 0.3.6", diff --git a/node-hub/dora-outtetts/pyproject.toml b/node-hub/dora-outtetts/pyproject.toml index 4b8893948..32ca5fa73 100644 --- a/node-hub/dora-outtetts/pyproject.toml +++ b/node-hub/dora-outtetts/pyproject.toml @@ -2,10 +2,10 @@ name = "dora-outtetts" version = "0.0.0" authors = [] -license = "MIT License" description = "dora-outtetts" +license = { text = "MIT" } readme = "README.md" - +requires-python = ">=3.7" dependencies = [ "dora-rs >= 0.3.6", diff --git a/node-hub/dora-parler/pyproject.toml b/node-hub/dora-parler/pyproject.toml index 30919bdef..92faaf250 100644 --- a/node-hub/dora-parler/pyproject.toml +++ b/node-hub/dora-parler/pyproject.toml @@ -6,8 +6,9 @@ authors = [ { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora Node for Text to speech with dora Parler-TTS" +license = { text = "MIT" } readme = "README.md" - +requires-python = ">=3.7" dependencies = [ "dora-rs >= 0.3.6", diff --git a/node-hub/dora-piper/pyproject.toml b/node-hub/dora-piper/pyproject.toml index d20e773d2..781aaa6e4 100644 --- a/node-hub/dora-piper/pyproject.toml +++ b/node-hub/dora-piper/pyproject.toml @@ -3,8 +3,9 @@ name = "dora-piper" version = "0.3.8" authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] description = "Dora Node for using Agilex piper" +license = { text = "MIT" } readme = "README.md" - +requires-python = ">=3.7" dependencies = ["dora-rs >= 0.3.6", "piper_sdk >= 0.0.8", "numpy < 2.0.0"] diff --git a/node-hub/dora-pyaudio/pyproject.toml b/node-hub/dora-pyaudio/pyproject.toml index e622862cb..e0153df1c 100644 --- a/node-hub/dora-pyaudio/pyproject.toml +++ b/node-hub/dora-pyaudio/pyproject.toml @@ -1,16 +1,16 @@ [project] name = "dora-pyaudio" -version = "0.0.0" +version = "0.0.1" authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] +license = { text = "MIT" } +readme = "README.md" +requires-python = ">=3.7" description = "dora-pyaudio" -license = "MIT License" - dependencies = [ "dora-rs >= 0.3.6", "numpy >= 1.0.0", "pyarrow >= 5.0.0", - "python >= 3.8", "pyaudio >= 0.1.0", ] @@ -19,7 +19,3 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] dora-pyaudio = "dora_pyaudio.main:main" - -[build-system] -requires = ["poetry-core>=1.8.0"] -build-backend = "poetry.core.masonry.api" diff --git a/node-hub/dora-pyorbbecksdk/pyproject.toml b/node-hub/dora-pyorbbecksdk/pyproject.toml index ea66c6bc0..5046aaeb2 100644 --- a/node-hub/dora-pyorbbecksdk/pyproject.toml +++ b/node-hub/dora-pyorbbecksdk/pyproject.toml @@ -6,8 +6,9 @@ authors = [ { name = "Xiang Yang", email = "Ryu-Yang@qq.com" }, ] description = "Dora Node for capturing video with PyOrbbeck SDK" +license = { text = "MIT" } readme = "README.md" - +requires-python = ">=3.7" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "opencv-python >= 4.1.1"] diff --git a/node-hub/dora-pyrealsense/pyproject.toml b/node-hub/dora-pyrealsense/pyproject.toml index 6903046b8..c3c53afd7 100644 --- a/node-hub/dora-pyrealsense/pyproject.toml +++ b/node-hub/dora-pyrealsense/pyproject.toml @@ -3,8 +3,9 @@ name = "dora-pyrealsense" version = "0.3.8" authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] description = "Dora Node for capturing video with Pyrealsense" +license = { text = "MIT" } readme = "README.md" - +requires-python = ">=3.7" dependencies = [ "dora-rs >= 0.3.6", diff --git a/node-hub/dora-qwenvl/pyproject.toml b/node-hub/dora-qwenvl/pyproject.toml index 25d3d2a9d..d11840996 100644 --- a/node-hub/dora-qwenvl/pyproject.toml +++ b/node-hub/dora-qwenvl/pyproject.toml @@ -6,8 +6,9 @@ authors = [ { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora Node for VLM" +license = { text = "MIT" } readme = "README.md" - +requires-python = ">=3.7" dependencies = [ "dora-rs >= 0.3.6", diff --git a/node-hub/dora-rdt-1b/pyproject.toml b/node-hub/dora-rdt-1b/pyproject.toml index 541828678..ef355d0cc 100644 --- a/node-hub/dora-rdt-1b/pyproject.toml +++ b/node-hub/dora-rdt-1b/pyproject.toml @@ -3,8 +3,9 @@ name = "dora-rdt-1b" version = "0.3.8" authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] description = "Dora Node for RDT 1B" +license = { text = "MIT" } readme = "README.md" - +requires-python = ">=3.7" dependencies = [ "dora-rs >= 0.3.6", diff --git a/node-hub/dora-ugv/pyproject.toml b/node-hub/dora-ugv/pyproject.toml index 86daff72b..5c122b695 100644 --- a/node-hub/dora-ugv/pyproject.toml +++ b/node-hub/dora-ugv/pyproject.toml @@ -3,8 +3,9 @@ name = "dora-ugv" version = "0.3.6" authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] description = "Dora Node for using Agilex UGV" +license = { text = "MIT" } readme = "README.md" - +requires-python = ">=3.7" dependencies = ["dora-rs >= 0.3.6", "python >= 3.7"] diff --git a/node-hub/dora-vad/pyproject.toml b/node-hub/dora-vad/pyproject.toml index 044e53a4c..1ba5762f7 100644 --- a/node-hub/dora-vad/pyproject.toml +++ b/node-hub/dora-vad/pyproject.toml @@ -2,9 +2,10 @@ name = "dora-vad" version = "0.3.8" description = "Dora Node for Text translating using Argostranslate" -readme = "README.md" authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] - +license = { text = "MIT" } +readme = "README.md" +requires-python = ">=3.7" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "silero-vad >= 5.1"] diff --git a/node-hub/dora-yolo/pyproject.toml b/node-hub/dora-yolo/pyproject.toml index e96cffc37..af386cd62 100644 --- a/node-hub/dora-yolo/pyproject.toml +++ b/node-hub/dora-yolo/pyproject.toml @@ -6,8 +6,9 @@ authors = [ { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora Node for object detection with dora YOLOv8" +license = { text = "MIT" } readme = "README.md" - +requires-python = ">=3.7" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "ultralytics >= 8.3.24"] diff --git a/node-hub/llama-factory-recorder/pyproject.toml b/node-hub/llama-factory-recorder/pyproject.toml index 4a2730bca..8fe7a220d 100644 --- a/node-hub/llama-factory-recorder/pyproject.toml +++ b/node-hub/llama-factory-recorder/pyproject.toml @@ -6,9 +6,10 @@ authors = [ { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora Node for VLM" -readme = "README.md" +requires-python = ">=3.7" + dependencies = [ "dora-rs >= 0.3.6", "pillow >= 10.4.0", diff --git a/node-hub/opencv-plot/pyproject.toml b/node-hub/opencv-plot/pyproject.toml index c1a095420..7a65a40e4 100644 --- a/node-hub/opencv-plot/pyproject.toml +++ b/node-hub/opencv-plot/pyproject.toml @@ -6,9 +6,10 @@ authors = [ { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora Node for plotting text and bbox on image with OpenCV" -readme = "README.md" +requires-python = ">=3.7" + dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "opencv-python >= 4.1.1"] [dependency-groups] diff --git a/node-hub/opencv-video-capture/pyproject.toml b/node-hub/opencv-video-capture/pyproject.toml index e5e18a802..507af9142 100644 --- a/node-hub/opencv-video-capture/pyproject.toml +++ b/node-hub/opencv-video-capture/pyproject.toml @@ -6,8 +6,9 @@ authors = [ { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora Node for capturing video with OpenCV" +license = { text = "MIT" } readme = "README.md" - +requires-python = ">=3.7" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "opencv-python >= 4.1.1"] diff --git a/node-hub/pyarrow-assert/pyproject.toml b/node-hub/pyarrow-assert/pyproject.toml index 5ec2ef801..7fbf0d820 100644 --- a/node-hub/pyarrow-assert/pyproject.toml +++ b/node-hub/pyarrow-assert/pyproject.toml @@ -1,5 +1,4 @@ [project] -readme = "README.md" name = "pyarrow-assert" version = "0.3.8" authors = [ @@ -7,7 +6,10 @@ authors = [ { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora Node for plotting text and bbox on image with OpenCV" -license = "MIT License" +license = { text = "MIT" } +readme = "README.md" + +requires-python = ">=3.7" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "pyarrow >= 5.0.0"] diff --git a/node-hub/pyarrow-sender/pyproject.toml b/node-hub/pyarrow-sender/pyproject.toml index d5ff5d316..cab0f56b0 100644 --- a/node-hub/pyarrow-sender/pyproject.toml +++ b/node-hub/pyarrow-sender/pyproject.toml @@ -6,10 +6,12 @@ authors = [ { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora pyarrow Sender" -license = "MIT License" - +license = { text = "MIT" } readme = "README.md" + +requires-python = ">=3.7" + dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "pyarrow >= 5.0.0"] [dependency-groups] diff --git a/node-hub/terminal-input/pyproject.toml b/node-hub/terminal-input/pyproject.toml index 92ae02fbd..6dc744b9d 100644 --- a/node-hub/terminal-input/pyproject.toml +++ b/node-hub/terminal-input/pyproject.toml @@ -6,10 +6,12 @@ authors = [ { name = "Enzo Le Van", email = "dev@enzo-le-van.fr" }, ] description = "Dora terminal input" -license = "MIT License" +license = { text = "MIT" } readme = "README.md" +requires-python = ">=3.7" + dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "pyarrow >= 5.0.0"] [dependency-groups] From c04a73b1a4e4cdfde8b5fe2e3f46478d1d68b700 Mon Sep 17 00:00:00 2001 From: haixuantao Date: Fri, 17 Jan 2025 14:33:27 +0100 Subject: [PATCH 12/17] Make requires python 3.8 to avoid resolution issues --- binaries/cli/pyproject.toml | 3 +-- .../cli/src/template/python/__node-name__/pyproject.toml | 2 +- node-hub/dora-argotranslate/pyproject.toml | 2 +- node-hub/dora-distil-whisper/pyproject.toml | 4 ++-- node-hub/dora-echo/pyproject.toml | 2 +- node-hub/dora-internvl/pyproject.toml | 2 +- node-hub/dora-keyboard/pyproject.toml | 2 +- node-hub/dora-kit-car/pyproject.toml | 2 +- node-hub/dora-microphone/pyproject.toml | 2 +- node-hub/dora-openai-server/pyproject.toml | 2 +- node-hub/dora-opus/pyproject.toml | 2 +- node-hub/dora-outtetts/pyproject.toml | 3 +-- node-hub/dora-parler/pyproject.toml | 2 +- node-hub/dora-piper/pyproject.toml | 2 +- node-hub/dora-pyaudio/pyproject.toml | 2 +- node-hub/dora-pyorbbecksdk/pyproject.toml | 2 +- node-hub/dora-pyrealsense/pyproject.toml | 8 ++++---- node-hub/dora-qwenvl/pyproject.toml | 2 +- node-hub/dora-rdt-1b/pyproject.toml | 2 +- node-hub/dora-rerun/pyproject.toml | 3 +++ node-hub/dora-ugv/pyproject.toml | 2 +- node-hub/dora-vad/pyproject.toml | 2 +- node-hub/dora-yolo/pyproject.toml | 2 +- node-hub/llama-factory-recorder/pyproject.toml | 2 +- node-hub/opencv-plot/pyproject.toml | 2 +- node-hub/opencv-video-capture/pyproject.toml | 2 +- node-hub/pyarrow-assert/pyproject.toml | 2 +- node-hub/pyarrow-sender/pyproject.toml | 2 +- node-hub/terminal-input/pyproject.toml | 2 +- 29 files changed, 35 insertions(+), 34 deletions(-) diff --git a/binaries/cli/pyproject.toml b/binaries/cli/pyproject.toml index 8347841f9..f8bb29143 100644 --- a/binaries/cli/pyproject.toml +++ b/binaries/cli/pyproject.toml @@ -7,8 +7,7 @@ name = "dora-rs-cli" dynamic = ["version"] scripts = { "dora" = "dora_cli:py_main" } license = { text = "MIT" } -readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = ['dora-rs'] [tool.maturin] diff --git a/binaries/cli/src/template/python/__node-name__/pyproject.toml b/binaries/cli/src/template/python/__node-name__/pyproject.toml index 181e3c0af..657793700 100644 --- a/binaries/cli/src/template/python/__node-name__/pyproject.toml +++ b/binaries/cli/src/template/python/__node-name__/pyproject.toml @@ -5,7 +5,7 @@ authors = [{ name = "Your Name", email = "email@email.com" }] description = "Node Name" license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "pyarrow >= 15.0.0"] diff --git a/node-hub/dora-argotranslate/pyproject.toml b/node-hub/dora-argotranslate/pyproject.toml index 69c7d517d..3e360cb55 100644 --- a/node-hub/dora-argotranslate/pyproject.toml +++ b/node-hub/dora-argotranslate/pyproject.toml @@ -9,7 +9,7 @@ authors = [ ] license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "argostranslate >= 1.9.6"] diff --git a/node-hub/dora-distil-whisper/pyproject.toml b/node-hub/dora-distil-whisper/pyproject.toml index 3de59748e..472759b08 100644 --- a/node-hub/dora-distil-whisper/pyproject.toml +++ b/node-hub/dora-distil-whisper/pyproject.toml @@ -8,7 +8,7 @@ authors = [ description = "Dora dora-distil-whisper" license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = [ "dora-rs >= 0.3.6", @@ -18,7 +18,7 @@ dependencies = [ "accelerate >= 0.29.2", "torch >= 2.2.0", "modelscope >= 1.18.1", - "lightning-whisper-mlx >= 0.0.10; sys_platform == darwin", + "lightning-whisper-mlx >= 0.0.10; sys_platform == 'darwin'", ] diff --git a/node-hub/dora-echo/pyproject.toml b/node-hub/dora-echo/pyproject.toml index b24f6e3dd..356d42b51 100644 --- a/node-hub/dora-echo/pyproject.toml +++ b/node-hub/dora-echo/pyproject.toml @@ -8,7 +8,7 @@ authors = [ description = "Dora echo" license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "pyarrow >= 5.0.0"] diff --git a/node-hub/dora-internvl/pyproject.toml b/node-hub/dora-internvl/pyproject.toml index 22e764adb..8e8b3740f 100644 --- a/node-hub/dora-internvl/pyproject.toml +++ b/node-hub/dora-internvl/pyproject.toml @@ -8,7 +8,7 @@ authors = [ description = "Dora Node for VLM" license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = [ diff --git a/node-hub/dora-keyboard/pyproject.toml b/node-hub/dora-keyboard/pyproject.toml index 9af4a8421..f7f7d813f 100644 --- a/node-hub/dora-keyboard/pyproject.toml +++ b/node-hub/dora-keyboard/pyproject.toml @@ -8,7 +8,7 @@ authors = [ description = "Dora dora-keyboard" license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = [ "dora-rs >= 0.3.6", diff --git a/node-hub/dora-kit-car/pyproject.toml b/node-hub/dora-kit-car/pyproject.toml index 1bd1f4d1e..e8176c575 100644 --- a/node-hub/dora-kit-car/pyproject.toml +++ b/node-hub/dora-kit-car/pyproject.toml @@ -9,7 +9,7 @@ authors = [{ name = "Leon", email = "echo_ai@foxmail.com" }] description = "Dora Node for dora kit car" license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" scripts = { "dora-kit-car" = "dora_kit_car:py_main" } diff --git a/node-hub/dora-microphone/pyproject.toml b/node-hub/dora-microphone/pyproject.toml index e71ec93de..1fb11987d 100644 --- a/node-hub/dora-microphone/pyproject.toml +++ b/node-hub/dora-microphone/pyproject.toml @@ -8,7 +8,7 @@ authors = [ description = "Dora dora-microphone" license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = [ "dora-rs >= 0.3.6", diff --git a/node-hub/dora-openai-server/pyproject.toml b/node-hub/dora-openai-server/pyproject.toml index c4fddeb45..6d29f2f76 100644 --- a/node-hub/dora-openai-server/pyproject.toml +++ b/node-hub/dora-openai-server/pyproject.toml @@ -8,7 +8,7 @@ authors = [ description = "Dora OpenAI API Server" license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = [ "dora-rs >= 0.3.6", diff --git a/node-hub/dora-opus/pyproject.toml b/node-hub/dora-opus/pyproject.toml index fe4492fc2..70e4c50c0 100644 --- a/node-hub/dora-opus/pyproject.toml +++ b/node-hub/dora-opus/pyproject.toml @@ -10,7 +10,7 @@ authors = [ license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = [ "dora-rs >= 0.3.6", diff --git a/node-hub/dora-outtetts/pyproject.toml b/node-hub/dora-outtetts/pyproject.toml index 32ca5fa73..9cc505493 100644 --- a/node-hub/dora-outtetts/pyproject.toml +++ b/node-hub/dora-outtetts/pyproject.toml @@ -5,13 +5,12 @@ authors = [] description = "dora-outtetts" license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = [ "dora-rs >= 0.3.6", "numpy < 2.0.0", "pyarrow >= 5.0.0", - "python >= 3.10", "outetts >= 0.2.3", "llama-cpp-python >= 0.3.5", ] diff --git a/node-hub/dora-parler/pyproject.toml b/node-hub/dora-parler/pyproject.toml index 92faaf250..1434055de 100644 --- a/node-hub/dora-parler/pyproject.toml +++ b/node-hub/dora-parler/pyproject.toml @@ -8,7 +8,7 @@ authors = [ description = "Dora Node for Text to speech with dora Parler-TTS" license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = [ "dora-rs >= 0.3.6", diff --git a/node-hub/dora-piper/pyproject.toml b/node-hub/dora-piper/pyproject.toml index 781aaa6e4..809b40c8c 100644 --- a/node-hub/dora-piper/pyproject.toml +++ b/node-hub/dora-piper/pyproject.toml @@ -5,7 +5,7 @@ authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] description = "Dora Node for using Agilex piper" license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = ["dora-rs >= 0.3.6", "piper_sdk >= 0.0.8", "numpy < 2.0.0"] diff --git a/node-hub/dora-pyaudio/pyproject.toml b/node-hub/dora-pyaudio/pyproject.toml index e0153df1c..137cb98a4 100644 --- a/node-hub/dora-pyaudio/pyproject.toml +++ b/node-hub/dora-pyaudio/pyproject.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" description = "dora-pyaudio" dependencies = [ diff --git a/node-hub/dora-pyorbbecksdk/pyproject.toml b/node-hub/dora-pyorbbecksdk/pyproject.toml index 5046aaeb2..1042cbf04 100644 --- a/node-hub/dora-pyorbbecksdk/pyproject.toml +++ b/node-hub/dora-pyorbbecksdk/pyproject.toml @@ -8,7 +8,7 @@ authors = [ description = "Dora Node for capturing video with PyOrbbeck SDK" license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "opencv-python >= 4.1.1"] diff --git a/node-hub/dora-pyrealsense/pyproject.toml b/node-hub/dora-pyrealsense/pyproject.toml index c3c53afd7..d1fc525a8 100644 --- a/node-hub/dora-pyrealsense/pyproject.toml +++ b/node-hub/dora-pyrealsense/pyproject.toml @@ -5,15 +5,15 @@ authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] description = "Dora Node for capturing video with Pyrealsense" license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = [ "dora-rs >= 0.3.6", "numpy < 2.0.0", "opencv-python >= 4.1.1", - "pyrealsense2-macosx = 2.54.2; sys_platform == 'darwin'", - "pyrealsense2 = '2.54.1.5216'; sys_platform == 'linux'", - "pyrealsense2 = '2.54.1.5216'; sys_platform == 'windows'", + "pyrealsense2-macosx >= 2.54.2; sys_platform == 'darwin'", + "pyrealsense2 == 2.54.1.5216; sys_platform == 'linux'", + "pyrealsense2 == 2.54.1.5216; sys_platform == 'windows'", ] [dependency-groups] dev = ["pytest >=8.1.1", "ruff >=0.9.1"] diff --git a/node-hub/dora-qwenvl/pyproject.toml b/node-hub/dora-qwenvl/pyproject.toml index d11840996..7e50987c2 100644 --- a/node-hub/dora-qwenvl/pyproject.toml +++ b/node-hub/dora-qwenvl/pyproject.toml @@ -8,7 +8,7 @@ authors = [ description = "Dora Node for VLM" license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = [ "dora-rs >= 0.3.6", diff --git a/node-hub/dora-rdt-1b/pyproject.toml b/node-hub/dora-rdt-1b/pyproject.toml index ef355d0cc..f0f45ba5f 100644 --- a/node-hub/dora-rdt-1b/pyproject.toml +++ b/node-hub/dora-rdt-1b/pyproject.toml @@ -5,7 +5,7 @@ authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] description = "Dora Node for RDT 1B" license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = [ "dora-rs >= 0.3.6", diff --git a/node-hub/dora-rerun/pyproject.toml b/node-hub/dora-rerun/pyproject.toml index be5c29fa7..e6b3de96b 100644 --- a/node-hub/dora-rerun/pyproject.toml +++ b/node-hub/dora-rerun/pyproject.toml @@ -5,6 +5,9 @@ build-backend = "maturin" [project] name = "dora-rerun" dynamic = ["version"] +license = { text = "MIT" } +requires-python = ">=3.7" + dependencies = [ 'rerun_sdk==0.21.0', # "rerun-loader-urdf @ git+https://github.com/rerun-io/rerun-loader-python-example-urdf.git", diff --git a/node-hub/dora-ugv/pyproject.toml b/node-hub/dora-ugv/pyproject.toml index 5c122b695..fcb52dc5c 100644 --- a/node-hub/dora-ugv/pyproject.toml +++ b/node-hub/dora-ugv/pyproject.toml @@ -5,7 +5,7 @@ authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] description = "Dora Node for using Agilex UGV" license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = ["dora-rs >= 0.3.6", "python >= 3.7"] diff --git a/node-hub/dora-vad/pyproject.toml b/node-hub/dora-vad/pyproject.toml index 1ba5762f7..993b7e8b9 100644 --- a/node-hub/dora-vad/pyproject.toml +++ b/node-hub/dora-vad/pyproject.toml @@ -5,7 +5,7 @@ description = "Dora Node for Text translating using Argostranslate" authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "silero-vad >= 5.1"] diff --git a/node-hub/dora-yolo/pyproject.toml b/node-hub/dora-yolo/pyproject.toml index af386cd62..bf55a1b44 100644 --- a/node-hub/dora-yolo/pyproject.toml +++ b/node-hub/dora-yolo/pyproject.toml @@ -8,7 +8,7 @@ authors = [ description = "Dora Node for object detection with dora YOLOv8" license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "ultralytics >= 8.3.24"] diff --git a/node-hub/llama-factory-recorder/pyproject.toml b/node-hub/llama-factory-recorder/pyproject.toml index 8fe7a220d..11fb5f062 100644 --- a/node-hub/llama-factory-recorder/pyproject.toml +++ b/node-hub/llama-factory-recorder/pyproject.toml @@ -8,7 +8,7 @@ authors = [ description = "Dora Node for VLM" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = [ "dora-rs >= 0.3.6", diff --git a/node-hub/opencv-plot/pyproject.toml b/node-hub/opencv-plot/pyproject.toml index 7a65a40e4..13545fbe4 100644 --- a/node-hub/opencv-plot/pyproject.toml +++ b/node-hub/opencv-plot/pyproject.toml @@ -8,7 +8,7 @@ authors = [ description = "Dora Node for plotting text and bbox on image with OpenCV" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "opencv-python >= 4.1.1"] diff --git a/node-hub/opencv-video-capture/pyproject.toml b/node-hub/opencv-video-capture/pyproject.toml index 507af9142..d79dc0845 100644 --- a/node-hub/opencv-video-capture/pyproject.toml +++ b/node-hub/opencv-video-capture/pyproject.toml @@ -8,7 +8,7 @@ authors = [ description = "Dora Node for capturing video with OpenCV" license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "opencv-python >= 4.1.1"] diff --git a/node-hub/pyarrow-assert/pyproject.toml b/node-hub/pyarrow-assert/pyproject.toml index 7fbf0d820..964a4e385 100644 --- a/node-hub/pyarrow-assert/pyproject.toml +++ b/node-hub/pyarrow-assert/pyproject.toml @@ -9,7 +9,7 @@ description = "Dora Node for plotting text and bbox on image with OpenCV" license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "pyarrow >= 5.0.0"] diff --git a/node-hub/pyarrow-sender/pyproject.toml b/node-hub/pyarrow-sender/pyproject.toml index cab0f56b0..1f8efd43e 100644 --- a/node-hub/pyarrow-sender/pyproject.toml +++ b/node-hub/pyarrow-sender/pyproject.toml @@ -10,7 +10,7 @@ license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "pyarrow >= 5.0.0"] diff --git a/node-hub/terminal-input/pyproject.toml b/node-hub/terminal-input/pyproject.toml index 6dc744b9d..87cee72d5 100644 --- a/node-hub/terminal-input/pyproject.toml +++ b/node-hub/terminal-input/pyproject.toml @@ -10,7 +10,7 @@ license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "pyarrow >= 5.0.0"] From a91270ae96a6cf567e4204f96490da13e59eb1ef Mon Sep 17 00:00:00 2001 From: haixuantao Date: Fri, 17 Jan 2025 15:46:25 +0100 Subject: [PATCH 13/17] Fix dependencies definition --- node-hub/dora-outtetts/pyproject.toml | 2 +- node-hub/dora-qwenvl/pyproject.toml | 2 +- node-hub/dora-rdt-1b/pyproject.toml | 16 ++++++++-------- node-hub/dora-ugv/pyproject.toml | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/node-hub/dora-outtetts/pyproject.toml b/node-hub/dora-outtetts/pyproject.toml index 9cc505493..e216e9d84 100644 --- a/node-hub/dora-outtetts/pyproject.toml +++ b/node-hub/dora-outtetts/pyproject.toml @@ -5,7 +5,7 @@ authors = [] description = "dora-outtetts" license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.8" +requires-python = ">=3.10" dependencies = [ "dora-rs >= 0.3.6", diff --git a/node-hub/dora-qwenvl/pyproject.toml b/node-hub/dora-qwenvl/pyproject.toml index 7e50987c2..71adba7da 100644 --- a/node-hub/dora-qwenvl/pyproject.toml +++ b/node-hub/dora-qwenvl/pyproject.toml @@ -20,7 +20,7 @@ dependencies = [ "accelerate >= 0.33", "opencv-python >= 4.1.1", "modelscope >= 1.18.1", - "peft = 0.13.2", + "peft == 0.13.2", ] # flash_attn = "^2.6.1" # Install using: pip install -U flash-attn --no-build-isolation diff --git a/node-hub/dora-rdt-1b/pyproject.toml b/node-hub/dora-rdt-1b/pyproject.toml index f0f45ba5f..56d21b6b4 100644 --- a/node-hub/dora-rdt-1b/pyproject.toml +++ b/node-hub/dora-rdt-1b/pyproject.toml @@ -17,14 +17,14 @@ dependencies = [ "accelerate >= 0.33", "opencv-python >= 4.1.1", "modelscope >= 1.18.1", - "packaging = 24.0", - "wandb =0.17.0", - "diffusers =0.27.2", - "timm =1.0.3", - "sentencepiece =0.2.0", - "h5py =3.11.0", - "imgaug =0.4.0", - "huggingface_hub = 0.23.5", + "packaging == 24.0", + "wandb == 0.17.0", + "diffusers == 0.27.2", + "timm == 1.0.3", + "sentencepiece == 0.2.0", + "h5py == 3.11.0", + "imgaug == 0.4.0", + "huggingface_hub == 0.23.5", ] # flash_attn = "^2.6.1" # Install using: pip install -U flash-attn --no-build-isolation diff --git a/node-hub/dora-ugv/pyproject.toml b/node-hub/dora-ugv/pyproject.toml index fcb52dc5c..00f4fd7cd 100644 --- a/node-hub/dora-ugv/pyproject.toml +++ b/node-hub/dora-ugv/pyproject.toml @@ -7,7 +7,7 @@ license = { text = "MIT" } readme = "README.md" requires-python = ">=3.8" -dependencies = ["dora-rs >= 0.3.6", "python >= 3.7"] +dependencies = ["dora-rs >= 0.3.6"] [dependency-groups] From 5205102ab31989df7953ac30c9f414fed9f039dd Mon Sep 17 00:00:00 2001 From: haixuantao Date: Fri, 17 Jan 2025 16:07:35 +0100 Subject: [PATCH 14/17] Remove poetry build system --- .gitignore | 2 +- .../cli/src/template/python/__node-name__/pyproject.toml | 4 ---- node-hub/README.md | 6 ------ node-hub/dora-argotranslate/pyproject.toml | 4 ---- node-hub/dora-distil-whisper/pyproject.toml | 4 ---- node-hub/dora-echo/pyproject.toml | 4 ---- node-hub/dora-internvl/pyproject.toml | 4 ---- node-hub/dora-keyboard/pyproject.toml | 4 ---- node-hub/dora-microphone/pyproject.toml | 4 ---- node-hub/dora-openai-server/pyproject.toml | 3 --- node-hub/dora-opus/pyproject.toml | 4 ---- node-hub/dora-outtetts/pyproject.toml | 4 ---- node-hub/dora-parler/pyproject.toml | 4 ---- node-hub/dora-piper/pyproject.toml | 4 ---- node-hub/dora-pyorbbecksdk/pyproject.toml | 4 ---- node-hub/dora-pyrealsense/pyproject.toml | 4 ---- node-hub/dora-qwenvl/pyproject.toml | 4 ---- node-hub/dora-rdt-1b/pyproject.toml | 3 --- node-hub/dora-ugv/pyproject.toml | 4 ---- node-hub/dora-vad/pyproject.toml | 4 ---- node-hub/dora-yolo/pyproject.toml | 4 ---- node-hub/llama-factory-recorder/pyproject.toml | 4 ---- node-hub/opencv-plot/pyproject.toml | 4 ---- node-hub/opencv-video-capture/pyproject.toml | 4 ---- node-hub/pyarrow-assert/pyproject.toml | 4 ---- node-hub/pyarrow-sender/pyproject.toml | 4 ---- node-hub/terminal-input/pyproject.toml | 4 ---- 27 files changed, 1 insertion(+), 105 deletions(-) diff --git a/.gitignore b/.gitignore index a1bb9947e..fd4fd7a63 100644 --- a/.gitignore +++ b/.gitignore @@ -129,7 +129,7 @@ ipython_config.py # PEP 582; used by e.g. github.com/David-OConnor/pyflow __pypackages__/ - +.ruff_cache # Celery stuff celerybeat-schedule celerybeat.pid diff --git a/binaries/cli/src/template/python/__node-name__/pyproject.toml b/binaries/cli/src/template/python/__node-name__/pyproject.toml index 657793700..90c388c69 100644 --- a/binaries/cli/src/template/python/__node-name__/pyproject.toml +++ b/binaries/cli/src/template/python/__node-name__/pyproject.toml @@ -14,7 +14,3 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] __node-name__ = "__node_name__.main:main" - -[build-system] -requires = ["poetry-core>=1.8.0"] -build-backend = "poetry.core.masonry.api" diff --git a/node-hub/README.md b/node-hub/README.md index da969eaff..f8e5e25ae 100644 --- a/node-hub/README.md +++ b/node-hub/README.md @@ -45,9 +45,6 @@ dependencies = [ [project.scripts] [name of the node with '-' to replace spaces] = "[name of the node with '_' to replace spaces].main:main" -[build-system] -requires = ["poetry-core>=1.0.0"] -build-backend = "poetry.core.masonry.api" ``` Finally, the README.md file should explicit all inputs/outputs of the node and how to configure it in the YAML file. @@ -76,9 +73,6 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] opencv-plot = "opencv_plot.main:main" -[build-system] -requires = ["poetry-core>=1.0.0"] -build-backend = "poetry.core.masonry.api" ``` ## License diff --git a/node-hub/dora-argotranslate/pyproject.toml b/node-hub/dora-argotranslate/pyproject.toml index 3e360cb55..9dd712f60 100644 --- a/node-hub/dora-argotranslate/pyproject.toml +++ b/node-hub/dora-argotranslate/pyproject.toml @@ -18,7 +18,3 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] dora-argotranslate = "dora_argotranslate.main:main" - -[build-system] -requires = ["poetry-core>=1.8.0"] -build-backend = "poetry.core.masonry.api" diff --git a/node-hub/dora-distil-whisper/pyproject.toml b/node-hub/dora-distil-whisper/pyproject.toml index 472759b08..f2fd138a3 100644 --- a/node-hub/dora-distil-whisper/pyproject.toml +++ b/node-hub/dora-distil-whisper/pyproject.toml @@ -27,7 +27,3 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] dora-distil-whisper = "dora_distil_whisper.main:main" - -[build-system] -requires = ["poetry-core>=1.8.0"] -build-backend = "poetry.core.masonry.api" diff --git a/node-hub/dora-echo/pyproject.toml b/node-hub/dora-echo/pyproject.toml index 356d42b51..8ba6c9d32 100644 --- a/node-hub/dora-echo/pyproject.toml +++ b/node-hub/dora-echo/pyproject.toml @@ -17,7 +17,3 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] dora-echo = "dora_echo.main:main" - -[build-system] -requires = ["poetry-core>=1.8.0"] -build-backend = "poetry.core.masonry.api" diff --git a/node-hub/dora-internvl/pyproject.toml b/node-hub/dora-internvl/pyproject.toml index 8e8b3740f..444cfe93c 100644 --- a/node-hub/dora-internvl/pyproject.toml +++ b/node-hub/dora-internvl/pyproject.toml @@ -30,7 +30,3 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] dora-internvl = "dora_internvl.main:main" - -[build-system] -requires = ["poetry-core>=1.8.0"] -build-backend = "poetry.core.masonry.api" diff --git a/node-hub/dora-keyboard/pyproject.toml b/node-hub/dora-keyboard/pyproject.toml index f7f7d813f..6eac8259e 100644 --- a/node-hub/dora-keyboard/pyproject.toml +++ b/node-hub/dora-keyboard/pyproject.toml @@ -23,7 +23,3 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] dora-keyboard = "dora_keyboard.main:main" - -[build-system] -requires = ["poetry-core>=1.8.0"] -build-backend = "poetry.core.masonry.api" diff --git a/node-hub/dora-microphone/pyproject.toml b/node-hub/dora-microphone/pyproject.toml index 1fb11987d..a701fe6d2 100644 --- a/node-hub/dora-microphone/pyproject.toml +++ b/node-hub/dora-microphone/pyproject.toml @@ -23,7 +23,3 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] dora-microphone = "dora_microphone.main:main" - -[build-system] -requires = ["poetry-core>=1.8.0"] -build-backend = "poetry.core.masonry.api" diff --git a/node-hub/dora-openai-server/pyproject.toml b/node-hub/dora-openai-server/pyproject.toml index 6d29f2f76..c828f859a 100644 --- a/node-hub/dora-openai-server/pyproject.toml +++ b/node-hub/dora-openai-server/pyproject.toml @@ -27,9 +27,6 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] dora-openai-server = "dora_openai_server.main:main" -[build-system] -requires = ["poetry-core>=1.8.0"] -build-backend = "poetry.core.masonry.api" [tool.ruff.lint] extend-select = ["I"] diff --git a/node-hub/dora-opus/pyproject.toml b/node-hub/dora-opus/pyproject.toml index 70e4c50c0..98bc6d54a 100644 --- a/node-hub/dora-opus/pyproject.toml +++ b/node-hub/dora-opus/pyproject.toml @@ -27,7 +27,3 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] dora-opus = "dora_opus.main:main" - -[build-system] -requires = ["poetry-core>=1.8.0"] -build-backend = "poetry.core.masonry.api" diff --git a/node-hub/dora-outtetts/pyproject.toml b/node-hub/dora-outtetts/pyproject.toml index e216e9d84..6ca297b9b 100644 --- a/node-hub/dora-outtetts/pyproject.toml +++ b/node-hub/dora-outtetts/pyproject.toml @@ -20,7 +20,3 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] dora-outtetts = "dora_outtetts.main:main" - -[build-system] -requires = ["poetry-core>=1.8.0"] -build-backend = "poetry.core.masonry.api" diff --git a/node-hub/dora-parler/pyproject.toml b/node-hub/dora-parler/pyproject.toml index 1434055de..06331db4b 100644 --- a/node-hub/dora-parler/pyproject.toml +++ b/node-hub/dora-parler/pyproject.toml @@ -29,7 +29,3 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] dora-parler = "dora_parler.main:main" - -[build-system] -requires = ["poetry-core>=1.8.0"] -build-backend = "poetry.core.masonry.api" diff --git a/node-hub/dora-piper/pyproject.toml b/node-hub/dora-piper/pyproject.toml index 809b40c8c..b57220916 100644 --- a/node-hub/dora-piper/pyproject.toml +++ b/node-hub/dora-piper/pyproject.toml @@ -14,7 +14,3 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] dora-piper = "dora_piper.main:main" - -[build-system] -requires = ["poetry-core>=1.8.0"] -build-backend = "poetry.core.masonry.api" diff --git a/node-hub/dora-pyorbbecksdk/pyproject.toml b/node-hub/dora-pyorbbecksdk/pyproject.toml index 1042cbf04..471d064b4 100644 --- a/node-hub/dora-pyorbbecksdk/pyproject.toml +++ b/node-hub/dora-pyorbbecksdk/pyproject.toml @@ -18,7 +18,3 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] dora-pyorbbecksdk = "dora_pyorbbecksdk.main:main" - -[build-system] -requires = ["poetry-core>=1.8.0"] -build-backend = "poetry.core.masonry.api" diff --git a/node-hub/dora-pyrealsense/pyproject.toml b/node-hub/dora-pyrealsense/pyproject.toml index d1fc525a8..1409ba086 100644 --- a/node-hub/dora-pyrealsense/pyproject.toml +++ b/node-hub/dora-pyrealsense/pyproject.toml @@ -20,7 +20,3 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] dora-pyrealsense = "dora_pyrealsense.main:main" - -[build-system] -requires = ["poetry-core>=1.8.0"] -build-backend = "poetry.core.masonry.api" diff --git a/node-hub/dora-qwenvl/pyproject.toml b/node-hub/dora-qwenvl/pyproject.toml index 71adba7da..9b95ac230 100644 --- a/node-hub/dora-qwenvl/pyproject.toml +++ b/node-hub/dora-qwenvl/pyproject.toml @@ -31,7 +31,3 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] dora-qwenvl = "dora_qwenvl.main:main" - -[build-system] -requires = ["poetry-core>=1.8.0"] -build-backend = "poetry.core.masonry.api" diff --git a/node-hub/dora-rdt-1b/pyproject.toml b/node-hub/dora-rdt-1b/pyproject.toml index 56d21b6b4..73c20189f 100644 --- a/node-hub/dora-rdt-1b/pyproject.toml +++ b/node-hub/dora-rdt-1b/pyproject.toml @@ -40,9 +40,6 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] dora-rdt-1b = "dora_rdt_1b.main:main" -[build-system] -requires = ["poetry-core>=1.8.0"] -build-backend = "poetry.core.masonry.api" [tool.ruff] exclude = ["dora_rdt_1b/RoboticsDiffusionTransformer"] diff --git a/node-hub/dora-ugv/pyproject.toml b/node-hub/dora-ugv/pyproject.toml index 00f4fd7cd..25fb99f13 100644 --- a/node-hub/dora-ugv/pyproject.toml +++ b/node-hub/dora-ugv/pyproject.toml @@ -15,7 +15,3 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] dora-ugv = "dora_ugv.main:main" - -[build-system] -requires = ["poetry-core>=1.8.0"] -build-backend = "poetry.core.masonry.api" diff --git a/node-hub/dora-vad/pyproject.toml b/node-hub/dora-vad/pyproject.toml index 993b7e8b9..17fa4da47 100644 --- a/node-hub/dora-vad/pyproject.toml +++ b/node-hub/dora-vad/pyproject.toml @@ -15,7 +15,3 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] dora-vad = "dora_vad.main:main" - -[build-system] -requires = ["poetry-core>=1.8.0"] -build-backend = "poetry.core.masonry.api" diff --git a/node-hub/dora-yolo/pyproject.toml b/node-hub/dora-yolo/pyproject.toml index bf55a1b44..84e2022e2 100644 --- a/node-hub/dora-yolo/pyproject.toml +++ b/node-hub/dora-yolo/pyproject.toml @@ -17,7 +17,3 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] dora-yolo = "dora_yolo.main:main" - -[build-system] -requires = ["poetry-core>=1.8.0"] -build-backend = "poetry.core.masonry.api" diff --git a/node-hub/llama-factory-recorder/pyproject.toml b/node-hub/llama-factory-recorder/pyproject.toml index 11fb5f062..6fc48834c 100644 --- a/node-hub/llama-factory-recorder/pyproject.toml +++ b/node-hub/llama-factory-recorder/pyproject.toml @@ -21,7 +21,3 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] llama-factory-recorder = "llama_factory_recorder.main:main" - -[build-system] -requires = ["poetry-core>=1.8.0"] -build-backend = "poetry.core.masonry.api" diff --git a/node-hub/opencv-plot/pyproject.toml b/node-hub/opencv-plot/pyproject.toml index 13545fbe4..7d56b925c 100644 --- a/node-hub/opencv-plot/pyproject.toml +++ b/node-hub/opencv-plot/pyproject.toml @@ -17,7 +17,3 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] opencv-plot = "opencv_plot.main:main" - -[build-system] -requires = ["poetry-core>=1.8.0"] -build-backend = "poetry.core.masonry.api" diff --git a/node-hub/opencv-video-capture/pyproject.toml b/node-hub/opencv-video-capture/pyproject.toml index d79dc0845..fe294882e 100644 --- a/node-hub/opencv-video-capture/pyproject.toml +++ b/node-hub/opencv-video-capture/pyproject.toml @@ -17,7 +17,3 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] opencv-video-capture = "opencv_video_capture.main:main" - -[build-system] -requires = ["poetry-core>=1.8.0"] -build-backend = "poetry.core.masonry.api" diff --git a/node-hub/pyarrow-assert/pyproject.toml b/node-hub/pyarrow-assert/pyproject.toml index 964a4e385..c69146076 100644 --- a/node-hub/pyarrow-assert/pyproject.toml +++ b/node-hub/pyarrow-assert/pyproject.toml @@ -18,7 +18,3 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] pyarrow-assert = "pyarrow_assert.main:main" - -[build-system] -requires = ["poetry-core>=1.8.0"] -build-backend = "poetry.core.masonry.api" diff --git a/node-hub/pyarrow-sender/pyproject.toml b/node-hub/pyarrow-sender/pyproject.toml index 1f8efd43e..0e97033ec 100644 --- a/node-hub/pyarrow-sender/pyproject.toml +++ b/node-hub/pyarrow-sender/pyproject.toml @@ -19,7 +19,3 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] pyarrow-sender = "pyarrow_sender.main:main" - -[build-system] -requires = ["poetry-core>=1.8.0"] -build-backend = "poetry.core.masonry.api" diff --git a/node-hub/terminal-input/pyproject.toml b/node-hub/terminal-input/pyproject.toml index 87cee72d5..60a3a3a41 100644 --- a/node-hub/terminal-input/pyproject.toml +++ b/node-hub/terminal-input/pyproject.toml @@ -19,7 +19,3 @@ dev = ["pytest >=8.1.1", "ruff >=0.9.1"] [project.scripts] terminal-input = "terminal_input.main:main" - -[build-system] -requires = ["poetry-core>=1.8.0"] -build-backend = "poetry.core.masonry.api" From 868f1f31fe18f3a876c260bfd444b69cfcc292fc Mon Sep 17 00:00:00 2001 From: haixuantao Date: Fri, 17 Jan 2025 16:44:54 +0100 Subject: [PATCH 15/17] Use poetry for rdt 1b as it seems to fix a submodule path issue --- node-hub/dora-rdt-1b/pyproject.toml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/node-hub/dora-rdt-1b/pyproject.toml b/node-hub/dora-rdt-1b/pyproject.toml index 73c20189f..1bf012f5a 100644 --- a/node-hub/dora-rdt-1b/pyproject.toml +++ b/node-hub/dora-rdt-1b/pyproject.toml @@ -5,11 +5,11 @@ authors = [{ name = "Haixuan Xavier Tao", email = "tao.xavier@outlook.com" }] description = "Dora Node for RDT 1B" license = { text = "MIT" } readme = "README.md" -requires-python = ">=3.8" +requires-python = ">=3.9" dependencies = [ "dora-rs >= 0.3.6", - "numpy < 2.0.0", + "numpy > 1.24.4", "torch >= 2.4.0", "torchvision >= 0.19", "transformers >= 4.45", @@ -43,3 +43,7 @@ dora-rdt-1b = "dora_rdt_1b.main:main" [tool.ruff] exclude = ["dora_rdt_1b/RoboticsDiffusionTransformer"] + +[build-system] +requires = ["poetry-core>=1.8.0"] +build-backend = "poetry.core.masonry.api" From 420833903586e28cc990f23d410ae059c39a92c0 Mon Sep 17 00:00:00 2001 From: haixuantao Date: Fri, 17 Jan 2025 16:45:12 +0100 Subject: [PATCH 16/17] Add messages within CI to better understand logs --- .github/workflows/node_hub_test.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/node_hub_test.sh b/.github/workflows/node_hub_test.sh index dbeb478bf..171ca6ab0 100755 --- a/.github/workflows/node_hub_test.sh +++ b/.github/workflows/node_hub_test.sh @@ -41,10 +41,12 @@ else cargo test else if [ -f "$dir/pyproject.toml" ]; then - echo "Running linting and tests for Python project in $dir..." + echo "CI: Installing in $dir..." uv venv uv pip install . + echo "CI: Running Linting in $dir..." uv run ruff check . + echo "CI: Running Pytest in $dir..." uv run pytest fi fi From ce3c3b23af22069a7518f1b990cf383d0e9aec22 Mon Sep 17 00:00:00 2001 From: haixuantao Date: Fri, 17 Jan 2025 17:35:59 +0100 Subject: [PATCH 17/17] Refactor readme --- .../cli/src/template/python/__node-name__/pyproject.toml | 2 +- node-hub/README.md | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/binaries/cli/src/template/python/__node-name__/pyproject.toml b/binaries/cli/src/template/python/__node-name__/pyproject.toml index 90c388c69..d5c38af45 100644 --- a/binaries/cli/src/template/python/__node-name__/pyproject.toml +++ b/binaries/cli/src/template/python/__node-name__/pyproject.toml @@ -7,7 +7,7 @@ license = { text = "MIT" } readme = "README.md" requires-python = ">=3.8" -dependencies = ["dora-rs >= 0.3.6", "numpy < 2.0.0", "pyarrow >= 15.0.0"] +dependencies = ["dora-rs >= 0.3.6"] [dependency-groups] dev = ["pytest >=8.1.1", "ruff >=0.9.1"] diff --git a/node-hub/README.md b/node-hub/README.md index f8e5e25ae..aa35bc609 100644 --- a/node-hub/README.md +++ b/node-hub/README.md @@ -30,16 +30,13 @@ And then you will need to adapt the following `pyproject.toml` file: [project] name = "[name of the node e.g. video-encoder, with '-' to replace spaces]" version = "0.1" -authors = [{name= "[Pseudo/Name]", email="[email]"] +authors = [{ name = "[Pseudo/Name]", email = "[email]" }] description = "Dora Node for []" readme = "README.md" - +license = { text = "MIT" } dependencies = [ -"dora-rs = "0.3.5", - - -... [add your dependencies here] ... + "dora-rs >= 0.3.8", ] [project.scripts]