Merge branch 'future3/develop' into pr/astnerdev/2557

Author: AlvinSchiller

.flake8

@@ -8,7 +8,9 @@ ignore =
     # continuation line under-indented for visual indent
     E128,
     # line break before binary operator
-    W503
+    W503,
+    # global name / nonlocal name is unused: name is never assigned in scope
+    F824
 per-file-ignores =
     # Only in __init__files ignore imported but unused
     # Not necessary, if __all__ is declared in __init__ file

.github/workflows/pythonpackage_future3.yml

@@ -5,11 +5,23 @@ on:
     branches:
         - 'future3/**'
     paths:
+        - '.github/workflows/pythonpackage_future3.yml'
+        - '.flake8'
+        - 'run_flake8.sh'
+        - '.coveragerc'
+        - 'run_pytest.sh'
+        - '**requirements*.txt'
         - '**.py'
   pull_request:
     branches:
         - 'future3/**'
     paths:
+        - '.github/workflows/pythonpackage_future3.yml'
+        - '.flake8'
+        - 'run_flake8.sh'
+        - '.coveragerc'
+        - 'run_pytest.sh'
+        - '**requirements*.txt'
         - '**.py'
 
 jobs:
@@ -19,7 +31,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
     - uses: actions/checkout@v4
@@ -31,6 +43,11 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install -y libasound2-dev pulseaudio
+
+        CUR_DIR="$(pwd)"
+        mkdir -p tmp && cd tmp && wget -q http://abyz.me.uk/lg/lg.zip && unzip lg.zip > /dev/null && cd lg && make && sudo make install
+        cd "${CUR_DIR}" && sudo rm -rf tmp > /dev/null
+
         python3 -m venv .venv
         source ".venv/bin/activate"
 

installation/includes/02_helpers.sh

@@ -399,7 +399,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' | xargs echo
 }
 
 # Check if all passed packages are installed. Fail on first missing.

installation/routines/setup_jukebox_core.sh

@@ -21,12 +21,13 @@ _jukebox_core_install_os_dependencies() {
     --allow-change-held-packages
 }
 
-_jukebox_core_build_and_install_lgpio() {
+_jukebox_core_build_and_install_lg() {
     local tmp_path="${HOME_PATH}/tmp"
     local lg_filename="lg"
     local lg_zip_filename="${lg_filename}.zip"
 
-    sudo apt-get -y install swig unzip python3-dev python3-setuptools
+    # always build lg and lgpio from source as pypi wheels are incomplete (armv6, python3.13) or broken (bullseye)
+    # build needs apt packages "swig python3-dev"
     mkdir -p "${tmp_path}" && cd "${tmp_path}" || exit_on_error
     download_from_url "http://abyz.me.uk/lg/${lg_zip_filename}" "${lg_zip_filename}"
     unzip ${lg_zip_filename} || exit_on_error
@@ -47,14 +48,9 @@ _jukebox_core_install_python_requirements() {
   # Remove excluded libs, if installed - see https://github.com/MiczFlor/RPi-Jukebox-RFID/pull/2470
   pip uninstall -y -r "${INSTALLATION_PATH}"/requirements-excluded.txt
 
-  # prepare lgpio build for bullseye as the binaries are broken
-  local pip_install_options=""
-  if [ "$(is_debian_version_at_least 12)" = false ]; then
-    _jukebox_core_build_and_install_lgpio
-    pip_install_options="--no-binary=lgpio"
-  fi
+  _jukebox_core_build_and_install_lg
 
-  pip install --no-cache-dir -r "${INSTALLATION_PATH}/requirements.txt" ${pip_install_options}
+  pip install --no-cache-dir -r "${INSTALLATION_PATH}/requirements.txt"
 }
 
 _jukebox_core_configure_pulseaudio() {

packages-core.txt

@@ -14,5 +14,9 @@ pulseaudio-utils
 python3
 python3-venv
 python3-dev
+python3-setuptools
 rsync
+swig # needed for lg build
+tar
+unzip
 wget

requirements.txt

@@ -22,7 +22,7 @@ tornado
 
 # RPi's GPIO packages:
 # use shim to keep current RPi.GPIO behavior also under Bookworm - see https://github.com/MiczFlor/RPi-Jukebox-RFID/issues/2313
-rpi-lgpio
+rpi-lgpio --no-binary=lgpio
 gpiozero
 
 # PyZMQ is a special case: