Merge branch 'main' into feature/pass-measured-fps-when-handling-live…

…-stream
roboflow · Nov 14, 2024 · e8ac049 · e8ac049
2 parents db89ef7 + 378c3b4
commit e8ac049
Show file tree

Hide file tree

Showing 21 changed files with 26 additions and 26 deletions.
diff --git a/docker/dockerfiles/Dockerfile.onnx.cpu b/docker/dockerfiles/Dockerfile.onnx.cpu
@@ -39,7 +39,7 @@ RUN pip3 install --upgrade pip  && pip3 install \
     -r requirements.yolo_world.txt \
     -r requirements.transformers.txt \
     jupyterlab \
-    setuptools<=75.5.0 \
+    "setuptools<=75.5.0" \
     --upgrade \
     && rm -rf ~/.cache/pip
 
@@ -51,7 +51,7 @@ COPY --from=base / /
 WORKDIR /build
 COPY . .
 RUN make create_wheels
-RUN pip3 install dist/inference_cli*.whl dist/inference_core*.whl dist/inference_cpu*.whl dist/inference_sdk*.whl setuptools<=75.5.0
+RUN pip3 install dist/inference_cli*.whl dist/inference_core*.whl dist/inference_cpu*.whl dist/inference_sdk*.whl "setuptools<=75.5.0"
 
 RUN if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then pip3 install -r requirements/requirements.vino.txt; rm -rf ~/.cache/pip; fi
 

diff --git a/docker/dockerfiles/Dockerfile.onnx.cpu.dev b/docker/dockerfiles/Dockerfile.onnx.cpu.dev
@@ -39,7 +39,7 @@ RUN pip3 install --upgrade pip  && pip3 install \
     -r requirements.yolo_world.txt \
     -r requirements.transformers.txt \
     jupyterlab \
-    setuptools<=75.5.0 \
+    "setuptools<=75.5.0" \
     --upgrade \
     && rm -rf ~/.cache/pip
 
@@ -51,7 +51,7 @@ COPY --from=base / /
 WORKDIR /build
 COPY . .
 RUN make create_wheels
-RUN pip3 install dist/inference_cli*.whl dist/inference_core*.whl dist/inference_cpu*.whl dist/inference_sdk*.whl setuptools<=75.5.0
+RUN pip3 install dist/inference_cli*.whl dist/inference_core*.whl dist/inference_cpu*.whl dist/inference_sdk*.whl "setuptools<=75.5.0"
 RUN pip3 install watchdog[watchmedo]
 RUN if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then pip3 install -r requirements/requirements.vino.txt; rm -rf ~/.cache/pip; fi
 

diff --git a/docker/dockerfiles/Dockerfile.onnx.cpu.parallel b/docker/dockerfiles/Dockerfile.onnx.cpu.parallel
@@ -42,7 +42,7 @@ RUN pip3 install --upgrade pip  && pip3 install \
     -r requirements.parallel.txt \
     -r requirements.cli.txt \
     -r requirements.sdk.http.txt \
-    setuptools<=75.5.0 \
+    "setuptools<=75.5.0" \
     --upgrade \
     && rm -rf ~/.cache/pip
 RUN apt-get update && apt-get install -y lsb-release curl gpg

diff --git a/docker/dockerfiles/Dockerfile.onnx.cpu.slim b/docker/dockerfiles/Dockerfile.onnx.cpu.slim
@@ -32,7 +32,7 @@ RUN pip3 install --upgrade pip  && pip3 install \
     -r requirements.waf.txt \
     -r requirements.cli.txt \
     -r requirements.sdk.http.txt \
-    setuptools<=75.5.0 \
+    "setuptools<=75.5.0" \
     --upgrade \
     && rm -rf ~/.cache/pip
 

diff --git a/docker/dockerfiles/Dockerfile.onnx.cpu.stream_manager b/docker/dockerfiles/Dockerfile.onnx.cpu.stream_manager
@@ -23,7 +23,7 @@ RUN pip3 install --upgrade pip  && pip3 install \
     -r _requirements.txt \
     -r requirements.cpu.txt \
     -r requirements.http.txt \
-    setuptools<=75.5.0 \
+    "setuptools<=75.5.0" \
     --upgrade \
     && rm -rf ~/.cache/pip
 

diff --git a/docker/dockerfiles/Dockerfile.onnx.gpu b/docker/dockerfiles/Dockerfile.onnx.gpu
@@ -44,7 +44,7 @@ RUN python3 -m pip install \
     -r requirements.yolo_world.txt \
     -r requirements.transformers.txt \
     jupyterlab \
-    setuptools<=75.5.0 \
+    "setuptools<=75.5.0" \
     --upgrade \
     && rm -rf ~/.cache/pip
 
@@ -61,7 +61,7 @@ WORKDIR /build
 COPY . .
 RUN ln -s /usr/bin/python3 /usr/bin/python
 RUN /bin/make create_wheels_for_gpu_notebook
-RUN pip3 install --no-cache-dir dist/inference_cli*.whl dist/inference_core*.whl dist/inference_gpu*.whl dist/inference_sdk*.whl setuptools<=75.5.0
+RUN pip3 install --no-cache-dir dist/inference_cli*.whl dist/inference_core*.whl dist/inference_gpu*.whl dist/inference_sdk*.whl "setuptools<=75.5.0"
 
 WORKDIR /notebooks
 COPY examples/notebooks .

diff --git a/docker/dockerfiles/Dockerfile.onnx.gpu.dev b/docker/dockerfiles/Dockerfile.onnx.gpu.dev
@@ -49,7 +49,7 @@ RUN python3 -m pip install \
     -r requirements.sdk.http.txt \
     -r requirements.cli.txt \
     jupyterlab \
-    setuptools<=75.5.0 \
+    "setuptools<=75.5.0" \
     --upgrade \
     && rm -rf ~/.cache/pip
 

diff --git a/docker/dockerfiles/Dockerfile.onnx.gpu.parallel b/docker/dockerfiles/Dockerfile.onnx.gpu.parallel
@@ -31,7 +31,7 @@ RUN pip3 install --upgrade pip  && pip3 install \
     -r requirements.waf.txt \
     -r requirements.gaze.txt \
     -r requirements.parallel.txt \
-    setuptools<=75.5.0 \
+    "setuptools<=75.5.0" \
     --upgrade \
     && rm -rf ~/.cache/pip
 
@@ -48,7 +48,7 @@ WORKDIR /build
 COPY . .
 RUN ln -s /usr/bin/python3 /usr/bin/python
 RUN /bin/make create_wheels_for_gpu_notebook
-RUN pip3 install dist/inference_cli*.whl dist/inference_core*.whl dist/inference_gpu*.whl dist/inference_sdk*.whl setuptools<=75.5.0
+RUN pip3 install dist/inference_cli*.whl dist/inference_core*.whl dist/inference_gpu*.whl dist/inference_sdk*.whl "setuptools<=75.5.0"
 
 WORKDIR /notebooks
 COPY examples/notebooks .

diff --git a/docker/dockerfiles/Dockerfile.onnx.gpu.slim b/docker/dockerfiles/Dockerfile.onnx.gpu.slim
@@ -27,7 +27,7 @@ RUN pip3 install --upgrade pip  && pip3 install \
     -r requirements.waf.txt \
     -r requirements.cli.txt \
     -r requirements.sdk.http.txt \
-    setuptools<=75.5.0 \
+    "setuptools<=75.5.0" \
     --upgrade \
     && rm -rf ~/.cache/pip
 

diff --git a/docker/dockerfiles/Dockerfile.onnx.gpu.stream_manager b/docker/dockerfiles/Dockerfile.onnx.gpu.stream_manager
@@ -21,7 +21,7 @@ RUN pip3 install --upgrade pip  && pip3 install \
     -r _requirements.txt \
     -r requirements.http.txt \
     -r requirements.gpu.txt \
-    setuptools<=75.5.0 \
+    "setuptools<=75.5.0" \
     --upgrade \
     && rm -rf ~/.cache/pip
 

diff --git a/docker/dockerfiles/Dockerfile.onnx.jetson.4.5.0 b/docker/dockerfiles/Dockerfile.onnx.jetson.4.5.0
@@ -42,7 +42,7 @@ RUN python3.8 -m pip install --upgrade pip wheel Cython && python3.8 -m pip inst
     -r requirements.sdk.http.txt \
     -r requirements.yolo_world.txt \
     jupyterlab \
-    setuptools<=75.5.0 \
+    "setuptools<=75.5.0" \
     --upgrade \
     && rm -rf ~/.cache/pip
 

diff --git a/docker/dockerfiles/Dockerfile.onnx.jetson.4.6.1 b/docker/dockerfiles/Dockerfile.onnx.jetson.4.6.1
@@ -57,7 +57,7 @@ RUN python3.9 -m pip install --upgrade pip "h5py<=3.10.0" && python3.9 -m pip in
     -r requirements.sdk.http.txt \
     -r requirements.yolo_world.txt \
     jupyterlab \
-    setuptools<=75.5.0 \
+    "setuptools<=75.5.0" \
     --upgrade \
     && rm -rf ~/.cache/pip
 

diff --git a/docker/dockerfiles/Dockerfile.onnx.jetson.5.1.1 b/docker/dockerfiles/Dockerfile.onnx.jetson.5.1.1
@@ -52,7 +52,7 @@ RUN python3.9 -m pip install --upgrade pip  && python3.9 -m pip install \
     -r requirements.sdk.http.txt \
     -r requirements.yolo_world.txt \
     jupyterlab \
-    setuptools<=75.5.0 \
+    "setuptools<=75.5.0" \
     --upgrade \
     && rm -rf ~/.cache/pip
 

diff --git a/docker/dockerfiles/Dockerfile.onnx.jetson.5.1.1.stream_manager b/docker/dockerfiles/Dockerfile.onnx.jetson.5.1.1.stream_manager
@@ -40,7 +40,7 @@ RUN pip3 install --upgrade pip  && pip3 install \
     -r _requirements.txt \
     -r requirements.clip.txt \
     -r requirements.http.txt \
-    setuptools<=75.5.0 \
+    "setuptools<=75.5.0" \
     --upgrade \
     && rm -rf ~/.cache/pip
 

diff --git a/docker/dockerfiles/Dockerfile.onnx.jetson.6.0.0 b/docker/dockerfiles/Dockerfile.onnx.jetson.6.0.0
@@ -35,7 +35,7 @@ RUN python3 -m pip install --upgrade pip && \
     -r requirements/requirements.sdk.http.txt \
     -r requirements/requirements.yolo_world.txt \
     -r requirements/requirements.jetson.txt \
-    setuptools<=75.5.0
+    "setuptools<=75.5.0"
 
 # Build the application
 WORKDIR /build
@@ -46,7 +46,7 @@ RUN rm -f dist/* && \
     python3 .release/pypi/inference.gpu.setup.py bdist_wheel && \
     python3 .release/pypi/inference.sdk.setup.py bdist_wheel && \
     python3 .release/pypi/inference.cli.setup.py bdist_wheel && \
-    python3 -m pip install dist/inference_cli*.whl dist/inference_core*.whl dist/inference_gpu*.whl dist/inference_sdk*.whl setuptools<=75.5.0
+    python3 -m pip install dist/inference_cli*.whl dist/inference_core*.whl dist/inference_gpu*.whl dist/inference_sdk*.whl "setuptools<=75.5.0"
 
 # Set up the application runtime
 WORKDIR /app

diff --git a/docker/dockerfiles/Dockerfile.onnx.lambda b/docker/dockerfiles/Dockerfile.onnx.lambda
@@ -47,7 +47,7 @@ RUN pip3 install \
     -r requirements.sdk.http.txt \
     -r requirements.yolo_world.txt \
     mangum \
-    setuptools<=75.5.0 \
+    "setuptools<=75.5.0" \
     --upgrade \
     --target "${LAMBDA_TASK_ROOT}" \
     && rm -rf ~/.cache/pip

diff --git a/docker/dockerfiles/Dockerfile.onnx.lambda.slim b/docker/dockerfiles/Dockerfile.onnx.lambda.slim
@@ -35,7 +35,7 @@ RUN pip3 install \
     -r requirements.hosted.txt \
     -r requirements.sdk.http.txt \
     mangum \
-    setuptools<=75.5.0 \
+    "setuptools<=75.5.0" \
     --upgrade \
     --target "${LAMBDA_TASK_ROOT}" \
     && rm -rf ~/.cache/pip

diff --git a/docker/dockerfiles/Dockerfile.onnx.trt b/docker/dockerfiles/Dockerfile.onnx.trt
@@ -33,7 +33,7 @@ RUN pip install --upgrade pip  && pip install \
     -r requirements.doctr.txt \
     -r requirements.groundingdino.txt \
     -r requirements.sdk.http.txt \
-    setuptools<=75.5.0 \
+    "setuptools<=75.5.0" \
     --upgrade \
     && rm -rf ~/.cache/pip
 

diff --git a/docker/dockerfiles/Dockerfile.onnx.udp.gpu b/docker/dockerfiles/Dockerfile.onnx.udp.gpu
@@ -25,7 +25,7 @@ RUN pip3 install --upgrade pip  && pip3 install \
     -r requirements.clip.txt \
     -r requirements.http.txt \
     -r requirements.gpu.txt \
-    setuptools<=75.5.0 \
+    "setuptools<=75.5.0" \
     --upgrade \
     && rm -rf ~/.cache/pip
 

diff --git a/docker/dockerfiles/Dockerfile.stream_management_api b/docker/dockerfiles/Dockerfile.stream_management_api
@@ -23,7 +23,7 @@ RUN pip3 install --upgrade pip  && pip3 install \
     -r _requirements.txt \
     -r requirements.cpu.txt \
     -r requirements.http.txt \
-    setuptools<=75.5.0 \
+    "setuptools<=75.5.0" \
     --upgrade \
     && rm -rf ~/.cache/pip
 

diff --git a/requirements/requirements.waf.txt b/requirements/requirements.waf.txt
@@ -1 +1 @@
-metlo~=0.1.5
+metlo>=0.0.17,<=0.1.5