From d080000bfdc428559267838f43cd8174028ddbe0 Mon Sep 17 00:00:00 2001
From: Alvin Schiller <103769832+AlvinSchiller@users.noreply.github.com>
Date: Tue, 16 Apr 2024 23:12:53 +0200
Subject: [PATCH] test req

---
 installation/includes/02_helpers.sh         | 2 +-
 installation/routines/setup_jukebox_core.sh | 9 ++++-----
 requirements.txt                            | 3 ++-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/installation/includes/02_helpers.sh b/installation/includes/02_helpers.sh
index dfad65187..4d873177a 100644
--- a/installation/includes/02_helpers.sh
+++ b/installation/includes/02_helpers.sh
@@ -393,7 +393,7 @@ verify_optional_service_enablement() {
 #   1    : textfile to read
 get_args_from_file() {
     local package_file="$1"
-    sed 's/.*#egg=//g' ${package_file} | sed -E 's/(#|=|>|<).*//g' | xargs echo
+    sed 's/.*#egg=//g' ${package_file} | sed -E 's/(#|=|>|<).*//g' | sed -E 's/^--.*//g' | xargs echo
 }
 
 # Check if all passed packages are installed. Fail on first missing.
diff --git a/installation/routines/setup_jukebox_core.sh b/installation/routines/setup_jukebox_core.sh
index 4708718bd..3e5b923f3 100644
--- a/installation/routines/setup_jukebox_core.sh
+++ b/installation/routines/setup_jukebox_core.sh
@@ -30,7 +30,10 @@ _jukebox_core_install_python_requirements() {
   source "$VIRTUAL_ENV/bin/activate"
 
   pip install --upgrade pip
-  pip install --no-cache-dir -r "${INSTALLATION_PATH}/requirements.txt"
+
+  _jukebox_core_build_and_install_pyzmq
+  ZMQ_PREFIX="${JUKEBOX_ZMQ_PREFIX}" ZMQ_DRAFT_API=1 \
+    pip install --no-cache-dir -r "${INSTALLATION_PATH}/requirements.txt"
 }
 
 _jukebox_core_configure_pulseaudio() {
@@ -84,9 +87,6 @@ _jukebox_core_build_and_install_pyzmq() {
     else
       _jukebox_core_download_prebuilt_libzmq_with_drafts
     fi
-
-    ZMQ_PREFIX="${JUKEBOX_ZMQ_PREFIX}" ZMQ_DRAFT_API=1 \
-      pip install -v --no-binary pyzmq 'pyzmq<26'
   else
     print_lc "    Skipping. pyzmq already installed"
   fi
@@ -135,7 +135,6 @@ _jukebox_core_check() {
 _run_setup_jukebox_core() {
     _jukebox_core_install_os_dependencies
     _jukebox_core_install_python_requirements
-    _jukebox_core_build_and_install_pyzmq
     _jukebox_core_configure_pulseaudio
     _jukebox_core_install_settings
     _jukebox_core_register_as_service
diff --git a/requirements.txt b/requirements.txt
index c172a7636..9d474fb53 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -27,7 +27,8 @@ gpiozero
 # PyZMQ is a special case:
 # On the PI, it needs to be compiled with special options to enable Websocket support
 # On regular Linux PCs, Websocket is enabled in the Python package
-# pyzmq
+pyzmq<26
+--no-binary=pyzmq
 
 # Code quality
 flake8>=4.0.0