Merge pull request #3134 from motioneye-project/dev

Beta 0.43.1b3

Author: MichaIng

.github/workflows/docker.yml

@@ -12,8 +12,7 @@ permissions:
 jobs:
   docker:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login != github.event.pull_request.base.repo.owner.login
-    # ToDo: Switch to Ubuntu Noble once runner host end cancellations are fixed: https://github.com/actions/runner-images/issues/9848#issuecomment-2137140734
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     permissions:
       packages: write
@@ -39,7 +38,8 @@ jobs:
       - name: Cache Docker layers
         uses: actions/cache@v4
         with:
-          path: /tmp/.buildx-cache
+          path: |
+            ${{ runner.temp }}/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-buildx-
@@ -60,21 +60,21 @@ jobs:
           password: ${{ github.token }}
 
       - name: Build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./docker/Dockerfile
-          platforms: linux/amd64,linux/arm64/v8,linux/arm/v7
+          platforms: linux/amd64,linux/arm64/v8,linux/arm/v7,linux/riscv64
           push: ${{ github.event_name == 'push' && github.repository == 'motioneye-project/motioneye' && steps.meta.outputs.tags != null }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           #build-args: |
           #  KEY1=Value1
           #  KEY2=Value2
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new
+          cache-from: type=local,src=${{ runner.temp }}/.buildx-cache
+          cache-to: type=local,dest=${{ runner.temp }}/.buildx-cache-new
 
       - name: Move cache
         run: |
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+          rm -rf ${{ runner.temp }}/.buildx-cache
+          mv ${{ runner.temp }}/.buildx-cache-new ${{ runner.temp }}/.buildx-cache

.github/workflows/python_safety.yml

@@ -14,11 +14,7 @@ jobs:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login != github.event.pull_request.base.repo.owner.login
     runs-on: ubuntu-24.04
     steps:
-      - run: sudo apt-get -q update
-      - run: sudo apt-get autopurge needrestart # https://github.com/actions/runner-images/pull/9956
       - run: echo -e '[global]\nbreak-system-packages=true' | sudo tee /etc/pip.conf # error: externally-managed-environment
-      - run: sudo DEBIAN_FRONTEND="noninteractive" apt-get -qq --no-install-recommends install
-             gcc libcurl4-openssl-dev libssl-dev
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
@@ -29,4 +25,5 @@ jobs:
       # Ignore CVE-2018-20225, which is IMO reasonably disputed: https://data.safetycli.com/v/67599/97c/
       # "extra"-index-url means an index to "additionally" look for newer versions, pre-compiled wheels, or similar, not to force this index being used.
       # There is "index-url" to enforce a different index: https://pip.pypa.io/en/stable/cli/pip_install/#cmdoption-i
-      - run: safety check --ignore 67599
+      # Ignore CVE-2019-8341 as well: https://github.com/pyupio/safety/issues/527
+      - run: safety check --ignore 67599,70612

.github/workflows/test_python.yml

@@ -16,9 +16,10 @@ jobs:
       matrix:
         include:
           # https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=python3
-          - { dist: 'ubuntu-20.04', python: '3.8.2' }
           - { dist: 'ubuntu-22.04', python: '3.10.6' }
           - { dist: 'ubuntu-24.04', python: '3.12.3' }
+          - { dist: 'ubuntu-22.04-arm', python: '3.10.6' }
+          - { dist: 'ubuntu-24.04-arm', python: '3.12.3' }
       fail-fast: false
     runs-on: ${{ matrix.dist }}
     name: "Test on ${{ matrix.dist }}"
@@ -27,9 +28,10 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
-      - run: sudo apt-mark hold grub-efi-amd64-signed # GRUB does not always find the drive it was configured for
+      - if: matrix.dist == 'ubuntu-22.04' || matrix.dist == 'ubuntu-24.04'
+        run: sudo apt-mark hold grub-efi-amd64-signed # GRUB does not always find the drive it was configured for
       - name: Ubuntu Noble workarounds
-        if: matrix.dist == 'ubuntu-24.04'
+        if: matrix.dist == 'ubuntu-24.04' || matrix.dist == 'ubuntu-24.04-arm'
         run: |
           # https://github.com/actions/runner-images/pull/9956
           sudo apt-get autopurge needrestart

.github/workflows/ubuntu_build.yml

@@ -13,24 +13,26 @@ jobs:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login != github.event.pull_request.base.repo.owner.login
     strategy:
       matrix:
-        dist: ['ubuntu-20.04', 'ubuntu-22.04', 'ubuntu-24.04']
+        dist: ['ubuntu-22.04', 'ubuntu-24.04', 'ubuntu-22.04-arm', 'ubuntu-24.04-arm']
       fail-fast: false
     runs-on: ${{ matrix.dist }}
     name: "Test on ${{ matrix.dist }}"
     steps:
-      - run: sudo apt-mark hold grub-efi-amd64-signed # GRUB does not always find the drive it was configured for
+      - if: matrix.dist == 'ubuntu-22.04' || matrix.dist == 'ubuntu-24.04'
+        run: sudo apt-mark hold grub-efi-amd64-signed # GRUB does not always find the drive it was configured for
       - name: Ubuntu Noble workarounds
-        if: matrix.dist == 'ubuntu-24.04'
+        if: matrix.dist == 'ubuntu-24.04' || matrix.dist == 'ubuntu-24.04-arm'
         run: |
           # https://github.com/actions/runner-images/pull/9956
           # ERROR: Cannot uninstall pip 24.0, RECORD file not found. Hint: The package was installed by debian.
-          sudo apt-get autopurge needrestart python3-pip python3-setuptools python3-wheel
+          # new firefox package pre-installation script subprocess returned error exit status 1
+          sudo apt-get autopurge needrestart python3-pip python3-setuptools python3-wheel firefox
           # error: externally-managed-environment
           echo -e '[global]\nbreak-system-packages=true' | sudo tee /etc/pip.conf
       - run: sudo apt-get -q update
       - run: sudo DEBIAN_FRONTEND=noninteractive apt-get -qq --no-install-recommends dist-upgrade
       - run: sudo DEBIAN_FRONTEND=noninteractive apt-get -qq --no-install-recommends install
-                  ca-certificates curl gcc libcurl4-openssl-dev libssl-dev python3-dev
+                  ca-certificates curl python3-dev
       - run: curl -sSfO 'https://bootstrap.pypa.io/get-pip.py'
       - run: sudo python3 get-pip.py
       - run: sudo python3 -m pip install --upgrade pip setuptools wheel

.pre-commit-config.yaml

@@ -9,7 +9,7 @@
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: check-builtin-literals
       - id: check-executables-have-shebangs
@@ -20,23 +20,23 @@ repos:
       - id: mixed-line-ending
       - id: trailing-whitespace
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.8
+    rev: 1.8.3
     hooks:
       - id: bandit
         args:
           - --skip=B104,B105,B108,B110,B301,B310,B321,B324,B402,B403,B404,B602,B603,B604,B605,B607,B701
   - repo: https://github.com/python/black
-    rev: 24.4.2
+    rev: 25.1.0
     hooks:
       - id: black
         args: [--skip-string-normalization]
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.3.0
+    rev: v2.4.1
     hooks:
       - id: codespell
       # See args in setup.cfg
   - repo: https://github.com/PyCQA/flake8
-    rev: 7.0.0
+    rev: 7.2.0
     hooks:
       - id: flake8
         additional_dependencies: [flake8-2020, flake8-bugbear, flake8-comprehensions, flake8-return]
@@ -49,12 +49,12 @@ repos:
           - --show-source
           - --statistics
   - repo: https://github.com/timothycrosley/isort
-    rev: 5.13.2
+    rev: 6.0.1
     hooks:
       - id: isort
         args: ["--profile", "black", "--filter-files"]
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.2
+    rev: v3.19.1
     hooks:
       - id: pyupgrade
         args: [--py37-plus]

README.md

@@ -19,16 +19,16 @@ These install instructions are constantly tested via CI/CD pipeline on Debian Bu
 
     _Here the commands for APT-based Linux distributions are given._
 
-    On **32-bit ARMv6 and ARMv7** systems, thanks to [piwheels](https://piwheels.org/), no development headers are required:
+    Thanks to pre-compiled wheels from PyPI, installing motionEye usually does not require anything but Python 3 and cURL with the ability to do HTTPS network requests:
     ```sh
     sudo apt update
-    sudo apt --no-install-recommends install ca-certificates curl python3 python3-distutils
+    sudo apt --no-install-recommends install ca-certificates curl python3
     ```
 
-    On **all other architectures** additional development headers are required:
+    On **ARMv6 and ARMv7 (32-bit), RISC-V and other rare CPU architectures** additional build dependencies may be required to compile the [Pillow](https://pypi.org/project/pillow/) and [PycURL](https://pypi.org/project/pycurl/) modules:
     ```sh
     sudo apt update
-    sudo apt --no-install-recommends install ca-certificates curl python3 python3-dev libcurl4-openssl-dev gcc libssl-dev
+    sudo apt --no-install-recommends install ca-certificates curl python3 python3-dev gcc libjpeg62-turbo-dev libcurl4-openssl-dev libssl-dev
     ```
 
 2. Install the Python package manager `pip`
@@ -45,12 +45,6 @@ These install instructions are constantly tested via CI/CD pipeline on Debian Bu
     sudo sed -i '/^\[global\]/a\break-system-packages=true' /etc/pip.conf
     ```
 
-    On **32-bit ARMv6 and ARMv7** systems, additionally configure `pip` to use pre-compiled wheels from [piwheels](https://piwheels.org/):
-    ```sh
-    grep -q '\[global\]' /etc/pip.conf 2> /dev/null || printf '%b' '[global]\n' | sudo tee -a /etc/pip.conf > /dev/null
-    sudo sed -i '/^\[global\]/a\extra-index-url=https://www.piwheels.org/simple/' /etc/pip.conf
-    ```
-
 3. Install and setup **motionEye**
     ```sh
     sudo python3 -m pip install --pre motioneye

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
 LABEL maintainer="Marcus Klein <himself@kleini.org>"
 
 # By default, run as root
@@ -9,12 +9,11 @@ COPY . /tmp/motioneye
 COPY docker/entrypoint.sh /entrypoint.sh
 
 # Build deps:
-# - armhf: Python headers, C compiler and libjpeg for Pillow, until piwheels provides the latest version: https://piwheels.org/project/pillow/
-# - other: Python headers, C compiler, libcurl and libssl for pycurl: https://pypi.org/project/pycurl/#files
+# - armhf/riscv64: Python headers, C compiler and libjpeg for Pillow: https://pypi.org/project/pillow/#files, libcurl and libssl for pycurl: https://pypi.org/project/pycurl/#files
 RUN printf '%b' '[global]\nbreak-system-packages=true\n' > /etc/pip.conf && \
     case "$(dpkg --print-architecture)" in \
-      'armhf') PACKAGES='python3-dev gcc libjpeg62-turbo-dev'; printf '%b' 'extra-index-url=https://www.piwheels.org/simple/\n' >> /etc/pip.conf;; \
-      *) PACKAGES='python3-dev gcc libcurl4-openssl-dev libssl-dev';; \
+      'armhf'|'riscv64') PACKAGES='python3-dev gcc libjpeg62-turbo-dev libcurl4-openssl-dev libssl-dev';; \
+      *) PACKAGES='';; \
     esac && \
     apt-get -q update && \
     DEBIAN_FRONTEND="noninteractive" apt-get -qq --option Dpkg::Options::="--force-confnew" --no-install-recommends install \

motioneye/__init__.py

@@ -1 +1 @@
-VERSION = "0.43.1b2"
+VERSION = "0.43.1b3"

motioneye/config.py

@@ -915,7 +915,7 @@ def motion_camera_ui_to_dict(ui, prev_config=None):
         'threshold_maximum': ui['max_frame_change_threshold'],
         'threshold_tune': ui['auto_threshold_tuning'],
         'noise_tune': ui['auto_noise_detect'],
-        'noise_level': max(1, int(round(int(ui['noise_level']) * 2.55))),
+        'noise_level': max(1, round(int(ui['noise_level']) * 2.55)),
         'lightswitch_percent': ui['light_switch_detect'],
         'event_gap': int(ui['event_gap']),
         'pre_capture': int(ui['pre_capture']),
@@ -1384,7 +1384,7 @@ def motion_camera_dict_to_ui(data):
         'auto_noise_detect': data['noise_tune'],
         'max_frame_change_threshold': data['threshold_maximum'],
         'auto_threshold_tuning': data['threshold_tune'],
-        'noise_level': int(int(data['noise_level']) / 2.55),
+        'noise_level': round(int(data['noise_level']) / 2.55),
         'light_switch_detect': data['lightswitch_percent'],
         'despeckle_filter': data['despeckle_filter'],
         'event_gap': int(data['event_gap']),
@@ -1938,11 +1938,6 @@ def backup():
 
 
 def restore(content):
-    global _main_config_cache
-    global _camera_config_cache
-    global _camera_ids_cache
-    global _additional_structure_cache
-
     logging.info('restoring config from backup file')
 
     cmd = ['tar', 'zxC', settings.CONF_PATH]

motioneye/controls/v4l2ctl.py

@@ -79,8 +79,6 @@ def list_devices():
 def list_resolutions(device):
     from motioneye import motionctl
 
-    global _resolutions_cache
-
     device = utils.make_str(device)
 
     if device in _resolutions_cache:
@@ -165,8 +163,6 @@ def find_persistent_device(device):
 
 
 def list_ctrls(device):
-    global _ctrls_cache
-
     device = utils.make_str(device)
 
     if device in _ctrls_cache: