pin python dep for selenium compat; remove unused mouse and leds jobs…

…; run usercode from /home/pi
dbieber · May 19, 2024 · 18f942a · 18f942a
1 parent c54e102
commit 18f942a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -207,6 +207,7 @@ jobs:
 
             # Add commands to the bash history for debugging purposes
             cat << EOF >> /home/pi/.bash_history
+            sudo reboot now
             sudo systemctl daemon-reload
             sudo systemctl status uap0.service
             sudo systemctl status dnsmasq.service
@@ -222,7 +223,9 @@ jobs:
             cat /etc/sysctl.conf
             cat /etc/dhcpcd.conf
             cat /etc/dnsmasq.conf
-            cat /etc/wpa_supplicant/wpa_supplicant.conf
+            sudo cat /etc/wpa_supplicant/wpa_supplicant.conf
+            sudo nano /etc/wpa_supplicant/wpa_supplicant.conf
+            nano /home/pi/code/github/dbieber/GoNoteGo/gonotego/settings/secure_settings.py
             /home/pi/code/github/dbieber/GoNoteGo/env/bin/python
             /home/pi/code/github/dbieber/GoNoteGo/env/bin/supervisorctl -u go -p notego status
             /home/pi/code/github/dbieber/GoNoteGo/env/bin/supervisorctl -u go -p notego restart all

diff --git a/gonotego/supervisord.conf b/gonotego/supervisord.conf
@@ -29,21 +29,10 @@ user=root
 
 [program:command-center-GoNoteGo]
 environment=XDG_RUNTIME_DIR="/run/user/1000"
-command=/home/pi/code/github/dbieber/GoNoteGo/env/bin/python gonotego/command_center/runner.py
-directory=/home/pi/code/github/dbieber/GoNoteGo
-user=pi
-
-[program:leds-GoNoteGo]
-command=/home/pi/code/github/dbieber/GoNoteGo/env/bin/python gonotego/leds/runner.py
-directory=/home/pi/code/github/dbieber/GoNoteGo
+command=/home/pi/code/github/dbieber/GoNoteGo/env/bin/python /home/pi/code/github/dbieber/GoNoteGo/gonotego/command_center/runner.py
+directory=/home/pi
 user=pi
 
-[program:mouse-GoNoteGo]
-environment=DISPLAY=":0.0",XAUTHORITY="/home/pi/.Xauthority"
-command=/home/pi/code/github/dbieber/GoNoteGo/env/bin/python gonotego/mouse/runner.py
-directory=/home/pi/code/github/dbieber/GoNoteGo
-user=root
-
 [program:text-listener-GoNoteGo]
 command=/home/pi/code/github/dbieber/GoNoteGo/env/bin/python gonotego/text/runner.py
 directory=/home/pi/code/github/dbieber/GoNoteGo
@@ -56,6 +45,6 @@ directory=/home/pi/code/github/dbieber/GoNoteGo
 user=pi
 
 [program:uploader-GoNoteGo]
-command=/home/pi/code/github/dbieber/GoNoteGo/env/bin/python gonotego/uploader/runner.py
-directory=/home/pi/code/github/dbieber/GoNoteGo
+command=/home/pi/code/github/dbieber/GoNoteGo/env/bin/python /home/pi/code/github/dbieber/GoNoteGo/gonotego/uploader/runner.py
+directory=/home/pi
 user=pi
diff --git a/pyproject.toml b/pyproject.toml
@@ -37,6 +37,7 @@ dependencies = [
   'soundfile',
   'supervisor',
   'twython',
+  "urllib3==1.26.16",  # For compatibility with selenium==3.141.0
 ]
 
 [project.optional-dependencies]