Merge pull request #3207 from motioneye-project/beta

Merge new beta to main branch

Author: MichaIng

.github/workflows/docker.yml

@@ -6,23 +6,20 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-permissions:
-  contents: read
+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
     runs-on: ubuntu-24.04
 
     permissions:
+      contents: read
       packages: write
 
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Docker meta
+      - uses: docker/metadata-action@v5
         id: meta
-        uses: docker/metadata-action@v5
         with:
           images: | # add potential Docker Hub image
             ghcr.io/${{ github.repository_owner }}/motioneye
@@ -33,16 +30,10 @@ jobs:
             type=semver,pattern={{major}}
 
       - uses: docker/setup-qemu-action@v3
-      - uses: docker/setup-buildx-action@v3
-
-      - name: Cache Docker layers
-        uses: actions/cache@v4
         with:
-          path: |
-            ${{ runner.temp }}/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
+          cache-image: false
+
+      - uses: docker/setup-buildx-action@v3
 
       #- name: Login to Docker Hub
       #  uses: docker/login-action@v3
@@ -59,22 +50,10 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ github.token }}
 
-      - name: Build
-        uses: docker/build-push-action@v6
+      - uses: docker/build-push-action@v6
         with:
-          context: .
           file: ./docker/Dockerfile
           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=${{ runner.temp }}/.buildx-cache
-          cache-to: type=local,dest=${{ runner.temp }}/.buildx-cache-new
-
-      - name: Move cache
-        run: |
-          rm -rf ${{ runner.temp }}/.buildx-cache
-          mv ${{ runner.temp }}/.buildx-cache-new ${{ runner.temp }}/.buildx-cache

.github/workflows/pre-commit-autoupdate.yml

@@ -3,31 +3,28 @@ name: pre-commit-autoupdate
 on:
   workflow_dispatch:
   schedule:
-    - cron: '42 15 * * *'
+    - cron: 42 15 * * *
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-permissions:
-  pull-requests: write
+permissions: {}
 
 jobs:
   pre-commit-autoupdate:
     runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         ref: dev
         # https://github.com/peter-evans/create-pull-request/issues/48
         token: ${{ secrets.GH_PAT }}
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v6
       with:
-        python-version: '3.x'
+        python-version: 3.x
         check-latest: true
-    - env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
+    - run: |
         branch_exists=0
         git fetch origin pre-commit-autoupdate && branch_exists=1
         if (( branch_exists ))
@@ -50,5 +47,6 @@ jobs:
         else
             git commit -m '[CI/CD] pre-commit autoupdate'
             git push origin pre-commit-autoupdate
+            export GH_TOKEN='${{ secrets.GH_PAT }}'
             gh pr create -B dev -H pre-commit-autoupdate -f -l 'CI/CD'
         fi

.github/workflows/pre-commit.yml

@@ -16,8 +16,8 @@ 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:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
+    - uses: actions/checkout@v5
+    - uses: actions/setup-python@v6
       with:
         python-version: '3.x'
         check-latest: true

.github/workflows/pypi_release.yml

@@ -9,8 +9,8 @@ jobs:
   release:
     runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
+    - uses: actions/checkout@v5
+    - uses: actions/setup-python@v6
       with:
         python-version: '3.x'
         check-latest: true

.github/workflows/python_safety.yml

@@ -15,8 +15,8 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - run: echo -e '[global]\nbreak-system-packages=true' | sudo tee /etc/pip.conf # error: externally-managed-environment
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.x
           check-latest: true

.github/workflows/shellcheck.yml

@@ -16,12 +16,13 @@ jobs:
     steps:
       - name: Install xz-utils
         run: |
+          command -v xz && exit 0
           sudo apt-get -q update
           sudo DEBIAN_FRONTEND=noninteractive apt-get -qq --no-install-recommends install xz-utils
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Download shellcheck
         run: |
-          curl -sSfL "$(curl -sSf 'https://api.github.com/repos/koalaman/shellcheck/releases/latest' | mawk -F\" '/"browser_download_url.*\.linux\.x86_64\.tar\.xz"/{print $4;exit}')" -o shellcheck.tar.xz
+          curl -sSfLo shellcheck.tar.xz "$(curl -sSf 'https://api.github.com/repos/koalaman/shellcheck/releases/latest' | mawk -F\" '/"browser_download_url.*\.linux\.x86_64\.tar\.xz"/{print $4;exit}')"
           tar --wildcards --strip-components=1 -xf shellcheck.tar.xz '*/shellcheck'
           rm shellcheck.tar.xz
       - name: Run shellcheck

.github/workflows/test_python.yml

@@ -24,19 +24,21 @@ jobs:
     runs-on: ${{ matrix.dist }}
     name: "Test on ${{ matrix.dist }}"
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python }}
       - 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' || matrix.dist == 'ubuntu-24.04-arm'
         run: |
-          # https://github.com/actions/runner-images/pull/9956
-          sudo apt-get autopurge needrestart
+          # new firefox package pre-installation script subprocess returned error exit status 1
+          sudo apt-get autopurge firefox
           # error: externally-managed-environment
           echo -e '[global]\nbreak-system-packages=true' | sudo tee /etc/pip.conf
+      # ERROR: Cannot uninstall pip 24.0, RECORD file not found. Hint: The package was installed by debian.
+      - run: sudo DEBIAN_FRONTEND="noninteractive" apt-get -qq autopurge python3-pip python3-setuptools python3-wheel
       - 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

.github/workflows/ubuntu_build.yml

@@ -23,16 +23,16 @@ jobs:
       - name: Ubuntu Noble workarounds
         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.
           # new firefox package pre-installation script subprocess returned error exit status 1
-          sudo apt-get autopurge needrestart python3-pip python3-setuptools python3-wheel firefox
+          sudo apt-get autopurge firefox
           # error: externally-managed-environment
           echo -e '[global]\nbreak-system-packages=true' | sudo tee /etc/pip.conf
+      # ERROR: Cannot uninstall pip 24.0, RECORD file not found. Hint: The package was installed by debian.
+      - run: sudo DEBIAN_FRONTEND="noninteractive" apt-get -qq autopurge python3-pip python3-setuptools python3-wheel python3-dev
       - 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 python3-dev
+                  ca-certificates curl python3
       - 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

.github/workflows/update_locales.yml

@@ -6,21 +6,16 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-permissions:
-  contents: read
-
-defaults:
-  run:
-    shell: sh
+permissions: {}
 
 jobs:
   update_locales:
-    # Skip for forks and dependabot which have no access to secrets (PAT)
-    if: github.event.pull_request.head.repo.fork == false && github.actor != 'dependabot[bot]'
+    # Skip for forks which have no access to secrets (PAT)
+    if: github.event.pull_request.head.repo.fork == false
     runs-on: ubuntu-24.04
     steps:
 
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v6
       with:
         python-version: '3.x'
         check-latest: true
@@ -32,7 +27,7 @@ jobs:
         sudo apt-get -q update
         sudo DEBIAN_FRONTEND='noninteractive' apt-get -qq --no-install-recommends install gettext
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         ref: ${{ github.head_ref }}
         # https://github.com/peter-evans/create-pull-request/issues/48

.pre-commit-config.yaml

@@ -9,7 +9,7 @@
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: check-builtin-literals
       - id: check-executables-have-shebangs
@@ -20,13 +20,13 @@ repos:
       - id: mixed-line-ending
       - id: trailing-whitespace
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.8.3
+    rev: 1.8.6
     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: 25.1.0
+    rev: 25.9.0
     hooks:
       - id: black
         args: [--skip-string-normalization]
@@ -36,10 +36,11 @@ repos:
       - id: codespell
       # See args in setup.cfg
   - repo: https://github.com/PyCQA/flake8
-    rev: 7.2.0
+    rev: 7.3.0
     hooks:
       - id: flake8
-        additional_dependencies: [flake8-2020, flake8-bugbear, flake8-comprehensions, flake8-return]
+        # Skipped plugins which are currently not used by "--select": flake8-return, which does not support Python 3.14 yet: https://github.com/afonasev/flake8-return/pull/139
+        additional_dependencies: [flake8-2020, flake8-bugbear, flake8-comprehensions]
         args:
           - --builtins=_
           - --count
@@ -49,12 +50,12 @@ repos:
           - --show-source
           - --statistics
   - repo: https://github.com/timothycrosley/isort
-    rev: 6.0.1
+    rev: 7.0.0
     hooks:
       - id: isort
         args: ["--profile", "black", "--filter-files"]
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.19.1
+    rev: v3.21.0
     hooks:
       - id: pyupgrade
         args: [--py37-plus]