Post release 0.3.6 small fix (#638)

Small PR to fix a small typo in the install script as well as add the installation script within the `README.md`
dora-rs · Aug 28, 2024 · 5e7f752 · 5e7f752
2 parents c6abec2 + 29f9161
commit 5e7f752
Show file tree

Hide file tree

Showing 20 changed files with 36 additions and 37 deletions.
diff --git a/.github/workflows/node-hub-ci-cd.yml b/.github/workflows/node-hub-ci-cd.yml
@@ -74,7 +74,7 @@ jobs:
             if [ -d "$dir" ]; then
               if [ -f "$dir/pyproject.toml" ]; then
                 echo "Publishing $dir using Poetry..."
-                (cd "$dir" && poetry publish)
+                (cd "$dir" && poetry publish --build)
               fi
               
               if [ -f "$dir/Cargo.toml" ]; then

diff --git a/README.md b/README.md
@@ -73,8 +73,8 @@ nodes:
       IMAGE_HEIGHT: 480
 
   - id: object-detection
-    build: pip install ../../node-hub/ultralytics-yolo
-    path: ultralytics-yolo
+    build: pip install ../../node-hub/dora-yolo
+    path: dora-yolo
     inputs:
       image:
         source: camera/image
@@ -157,6 +157,14 @@ cargo install dora-cli --locked
 dora --help
 ```
 
+On Unix system, you can install dora without cargo with:
+
+```bash
+curl --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/dora-rs/dora/main/install.sh | bash
+
+dora --help
+```
+
 For more info on installation, check out [our guide](https://www.dora-rs.ai/docs/guides/Installation/installing).
 
 ## Getting Started

diff --git a/examples/python-dataflow/README.md b/examples/python-dataflow/README.md
@@ -33,9 +33,9 @@ dora up
 dora start ./dataflow.yml (or dora start ./dataflow_dynamic.yml)
 ```
 
-**Note**: if you're running the dynamic dataflow, you will need to start manually the ultralytics-yolo node:
+**Note**: if you're running the dynamic dataflow, you will need to start manually the opencv-plot node:
 
 ```bash
 # activate your virtual environment in another terminal
 python opencv-plot --name plot
-```
+```
diff --git a/examples/python-dataflow/dataflow.yml b/examples/python-dataflow/dataflow.yml
@@ -12,8 +12,8 @@ nodes:
       IMAGE_HEIGHT: 480
 
   - id: object-detection
-    build: pip install ../../node-hub/ultralytics-yolo
-    path: ultralytics-yolo
+    build: pip install ../../node-hub/dora-yolo
+    path: dora-yolo
     inputs:
       image:
         source: camera/image

diff --git a/examples/rerun-viewer/dataflow.yml b/examples/rerun-viewer/dataflow.yml
@@ -13,8 +13,8 @@ nodes:
       ENCODING: rgb8
 
   - id: object-detection
-    build: pip install -e ../../node-hub/ultralytics-yolo
-    path: ultralytics-yolo
+    build: pip install -e ../../node-hub/dora-yolo
+    path: dora-yolo
     inputs:
       image:
         source: camera/image

diff --git a/install.sh b/install.sh
@@ -165,7 +165,7 @@ case $target in
   *) extension=zip; need unzip;;
 esac
 
-archive="$releases/download/v$tag/$bin-v$tag-$target.$extension"
+archive="$releases/download/$tag/$bin-$tag-$target.$extension"
 say "Repository:  $url"
 say "Bin:         $bin"
 say "Tag:         $tag"
@@ -182,6 +182,8 @@ else
   download "$archive" - | tar -C "$td" -xz
 fi
 
+echo "Placing dora-rs cli in $dest/$bin" 
+
 if [ -e "$dest/$bin" ] && [ "$force" = false ]; then
   err "\`$dest/$bin\` already exists"
 else

diff --git a/node-hub/dora-distil-whisper/pyproject.toml b/node-hub/dora-distil-whisper/pyproject.toml
@@ -19,13 +19,11 @@ pyarrow = ">= 5.0.0"
 transformers = ">= 4.0.0"
 accelerate = "^0.29.2"
 torch = "^2.1.1"
+python = "^3.7"
 
 [tool.poetry.scripts]
 dora-distil-whisper = "dora_distil_whisper.main:main"
 
 [build-system]
 requires = ["poetry-core>=1.8.0"]
 build-backend = "poetry.core.masonry.api"
-
-[project]
-readme = "README.md"
diff --git a/node-hub/dora-echo/pyproject.toml b/node-hub/dora-echo/pyproject.toml
@@ -16,13 +16,11 @@ packages = [{ include = "dora_echo" }]
 dora-rs = "^0.3.6"
 numpy = "< 2.0.0"
 pyarrow = ">= 5.0.0"
+python = "^3.7"
 
 [tool.poetry.scripts]
 dora-echo = "dora_echo.main:main"
 
 [build-system]
 requires = ["poetry-core>=1.8.0"]
 build-backend = "poetry.core.masonry.api"
-
-[project]
-readme = "README.md"
diff --git a/node-hub/dora-keyboard/pyproject.toml b/node-hub/dora-keyboard/pyproject.toml
@@ -17,13 +17,11 @@ dora-rs = "0.3.5"
 numpy = "< 2.0.0"
 pyarrow = ">= 5.0.0"
 pynput = "^1.7.6"
+python = "^3.7"
 
 [tool.poetry.scripts]
 dora-keyboard = "dora_keyboard.main:main"
 
 [build-system]
 requires = ["poetry-core>=1.8.0"]
 build-backend = "poetry.core.masonry.api"
-
-[project]
-readme = "README.md"
diff --git a/node-hub/dora-microphone/pyproject.toml b/node-hub/dora-microphone/pyproject.toml
@@ -17,13 +17,11 @@ dora-rs = "^0.3.6"
 numpy = "< 2.0.0"
 pyarrow = ">= 5.0.0"
 sounddevice = "^0.4.6"
+python = "^3.7"
 
 [tool.poetry.scripts]
 dora-microphone = "dora_microphone.main:main"
 
 [build-system]
 requires = ["poetry-core>=1.8.0"]
 build-backend = "poetry.core.masonry.api"
-
-[project]
-readme = "README.md"
diff --git a/node-hub/ultralytics-yolo/README.md → node-hub/dora-yolo/README.md b/node-hub/ultralytics-yolo/README.md → node-hub/dora-yolo/README.md
@@ -6,8 +6,8 @@ This node is used to detect objects in images using YOLOv8.
 
 ```yaml
 - id: object_detection
-  build: pip install ../../node-hub/ultralytics-yolo
-  path: ultralytics-yolo
+  build: pip install ../../node-hub/dora-yolo
+  path: dora-yolo
   inputs:
     image: webcam/image
 

diff --git a/...alytics-yolo/ultralytics_yolo/__init__.py → node-hub/dora-yolo/dora_yolo/__init__.py b/...alytics-yolo/ultralytics_yolo/__init__.py → node-hub/dora-yolo/dora_yolo/__init__.py
diff --git a/...ultralytics-yolo/ultralytics_yolo/main.py → node-hub/dora-yolo/dora_yolo/main.py b/...ultralytics-yolo/ultralytics_yolo/main.py → node-hub/dora-yolo/dora_yolo/main.py
diff --git a/node-hub/ultralytics-yolo/pyproject.toml → node-hub/dora-yolo/pyproject.toml b/node-hub/ultralytics-yolo/pyproject.toml → node-hub/dora-yolo/pyproject.toml
@@ -1,22 +1,23 @@
 [tool.poetry]
-name = "ultralytics-yolo"
+name = "dora-yolo"
 version = "0.3.6"
 authors = [
     "Haixuan Xavier Tao <[email protected]>",
     "Enzo Le Van <[email protected]>",
 ]
-description = "Dora Node for object detection with Ultralytics YOLOv8"
+description = "Dora Node for object detection with dora YOLOv8"
 readme = "README.md"
 
-packages = [{ include = "ultralytics_yolo" }]
+packages = [{ include = "dora_yolo" }]
 
 [tool.poetry.dependencies]
 dora-rs = "^0.3.6"
 numpy = "< 2.0.0"
 ultralytics = "<= 8.2.52"
+python = "^3.7"
 
 [tool.poetry.scripts]
-ultralytics-yolo = "ultralytics_yolo.main:main"
+dora-yolo = "dora_yolo.main:main"
 
 [build-system]
 requires = ["poetry-core>=1.8.0"]

diff --git a/...ytics-yolo/tests/test_ultralytics_yolo.py → .../dora-yolo/tests/test_ultralytics_yolo.py b/...ytics-yolo/tests/test_ultralytics_yolo.py → .../dora-yolo/tests/test_ultralytics_yolo.py
diff --git a/node-hub/opencv-plot/pyproject.toml b/node-hub/opencv-plot/pyproject.toml
@@ -14,6 +14,7 @@ packages = [{ include = "opencv_plot" }]
 dora-rs = "^0.3.6"
 numpy = "< 2.0.0"
 opencv-python = ">= 4.1.1"
+python = "^3.7"
 
 [tool.poetry.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
@@ -14,6 +14,7 @@ packages = [{ include = "opencv_video_capture" }]
 dora-rs = "^0.3.6"
 numpy = "< 2.0.0"
 opencv-python = ">= 4.1.1"
+python = "^3.7"
 
 [tool.poetry.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
@@ -16,13 +16,11 @@ packages = [{ include = "pyarrow_assert" }]
 dora-rs = "^0.3.6"
 numpy = "< 2.0.0"
 pyarrow = ">= 5.0.0"
+python = "^3.7"
 
 [tool.poetry.scripts]
 pyarrow-assert = "pyarrow_assert.main:main"
 
 [build-system]
 requires = ["poetry-core>=1.8.0"]
 build-backend = "poetry.core.masonry.api"
-
-[project]
-readme = "README.md"
diff --git a/node-hub/pyarrow-sender/pyproject.toml b/node-hub/pyarrow-sender/pyproject.toml
@@ -16,13 +16,11 @@ packages = [{ include = "pyarrow_sender" }]
 dora-rs = "^0.3.6"
 numpy = "< 2.0.0"
 pyarrow = ">= 5.0.0"
+python = "^3.7"
 
 [tool.poetry.scripts]
 pyarrow-sender = "pyarrow_sender.main:main"
 
 [build-system]
 requires = ["poetry-core>=1.8.0"]
 build-backend = "poetry.core.masonry.api"
-
-[project]
-readme = "README.md"
diff --git a/node-hub/terminal-input/pyproject.toml b/node-hub/terminal-input/pyproject.toml
@@ -16,13 +16,11 @@ packages = [{ include = "terminal_input" }]
 dora-rs = "^0.3.6"
 numpy = "< 2.0.0"
 pyarrow = ">= 5.0.0"
+python = "^3.7"
 
 [tool.poetry.scripts]
 terminal-input = "terminal_input.main:main"
 
 [build-system]
 requires = ["poetry-core>=1.8.0"]
 build-backend = "poetry.core.masonry.api"
-
-[project]
-readme = "README.md"