Merge remote-tracking branch 'origin/dev' into feat/ri2cb-robot-connections

2025-10-22 11:48:21 +02:00
parent da14a67791 4da83a0a7e
commit 8990af88fb
22 changed files with 1039 additions and 2 deletions
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,9 @@
 pyzmq<16
-pyaudio<=0.2.11
+<<<<<<< HEAD
+pyaudio<=0.2.11
+=======
+pyaudio<=0.2.11
+pytest<5
+pytest-mock<3.0.0
+pytest-cov<3.0.0
+>>>>>>> origin/dev