Merge branch 'develop'

CoderBotOrg · Mar 16, 2024 · 2383725 · 2383725
2 parents d0901c5 + ae0336b
commit 2383725
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 22 deletions.
diff --git a/coderbot/cv/image.py b/coderbot/cv/image.py
@@ -39,8 +39,7 @@ class Image():
     _aruco_dict = cv2.aruco.Dictionary_get(cv2.aruco.DICT_ARUCO_ORIGINAL)
     _aruco_parameters = cv2.aruco.DetectorParameters_create()
 
-    #_face_cascade = cv2.CascadeClassifier('/usr/local/share/OpenCV/haarcascades/haarcascade_frontalface_default.xml')
-    _face_cascade = cv2.CascadeClassifier('/usr/share/opencv/lbpcascades/lbpcascade_frontalface.xml')
+    _face_cascade = cv2.CascadeClassifier(cv2.data.haarcascades + 'haarcascade_frontalface_default.xml')
 
     def __init__(self, array):
         self._data = array

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM coderbot/rpi-debian:bullseye-20220923
+FROM coderbot/rpi-debian:bullseye-20240227
 
 ENV QEMU_CPU=max
 ENV DEBIAN_FRONTEND=noninteractive

diff --git a/docker/stub/requirements.txt b/docker/stub/requirements.txt
@@ -1,25 +1,25 @@
 # API framework
 connexion==2.14.2
-Flask==2.2.3
+Flask==2.2.5
 Flask-Cors==3.0.10
-tinydb==4.7.1
+tinydb==4.8.0
 Werkzeug==2.2.3
 
 # Misc utils
-setuptools==67.4.0
+setuptools==69.2.0
 event-channel==0.4.3
 
 # IO extensions
-spidev==3.5
+spidev==3.6
 
 # Audio
 sox==1.4.1
 
 # Computer Vision
-grpcio==1.48.1
-numpy==1.24.2
-Pillow==9.4.0
-protobuf==4.22.0
+grpcio==1.62.1
+numpy==1.26.4
+Pillow==10.2.0
+protobuf==4.25.2
 opencv-contrib-python==4.5.5.62
 tflite-runtime==2.11.0
 pytesseract==0.3.10

diff --git a/requirements.txt b/requirements.txt
@@ -1,29 +1,29 @@
 # API framework
 connexion==2.14.2
-Flask==2.2.3
+Flask==2.2.5
 Flask-Cors==3.0.10
-tinydb==4.7.1
+tinydb==4.8.0
 Werkzeug==2.2.3
 
 # Misc utils
-setuptools==67.4.0
+setuptools==69.2.0
 event-channel==0.4.3
 
 # IO extensions
 pigpio==1.78
-smbus2==0.4.2
-spidev==3.5
+smbus2==0.4.3
+spidev==3.6
 
 # Audio
 sox==1.4.1
-PyAudio==0.2.12
-pyalsaaudio==0.9.2
+PyAudio==0.2.14
+pyalsaaudio==0.10.0
 
 # Computer Vision
-grpcio==1.48.1
-numpy==1.24.2
-Pillow==9.4.0
-protobuf==4.22.0
+grpcio==1.62.1
+numpy==1.26.4
+Pillow==10.2.0
+protobuf==4.25.2
 opencv-contrib-python==4.5.5.62
 tflite-runtime==2.11.0
 pytesseract==0.3.10