Merge pull request #3312 from motioneye-project/dev

Beta 0.44.0b1

Author: MichaIng

.github/workflows/docker.yml

@@ -18,40 +18,44 @@ jobs:
       packages: write
 
     steps:
-      - uses: docker/metadata-action@v5
+      - uses: docker/metadata-action@v6
         id: meta
         with:
           images: |
             motioneyeproject/motioneye
             ghcr.io/${{ github.repository_owner }}/motioneye
+          flavor: latest=false
           tags: |
             type=edge,branch=dev
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
+            type=match,pattern=\d+\.\d+\.\d+b\d+
+            type=raw,value=beta,enable=${{ github.ref_type == 'tag' && contains(github.ref_name, 'b') && contains(github.ref_name, '.') && !startsWith(github.ref_name, 'v') && !contains(github.ref_name, '-') }}
+            type=raw,value=latest,enable=${{ github.ref_type == 'tag' && !contains(github.ref_name, 'b') && contains(github.ref_name, '.') && !startsWith(github.ref_name, 'v')  && !contains(github.ref_name, '-') }}
 
-      - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-qemu-action@v4
         with:
           cache-image: false
 
-      - uses: docker/setup-buildx-action@v3
+      - uses: docker/setup-buildx-action@v4
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         if: github.event_name == 'push' && github.repository == 'motioneye-project/motioneye' && steps.meta.outputs.tags != null
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         if: github.event_name == 'push' && github.repository == 'motioneye-project/motioneye' && steps.meta.outputs.tags != null
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ github.token }}
 
-      - uses: docker/build-push-action@v6
+      - uses: docker/build-push-action@v7
         with:
           file: ./docker/Dockerfile
           platforms: linux/amd64,linux/arm64/v8,linux/arm/v7,linux/riscv64

.github/workflows/test_python.yml

@@ -30,9 +30,9 @@ jobs:
           # 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 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 install curl ffmpeg motion v4l-utils
+      - run: sudo DEBIAN_FRONTEND='noninteractive' apt-get -qq --no-install-recommends install curl ffmpeg motion v4l-utils
       - uses: actions/checkout@v6
       - uses: actions/setup-python@v6
         with:
@@ -42,9 +42,5 @@ jobs:
       - run: python3 -m build
       - run: python3 -m pip install .
       - run: mkdir --parents --verbose .mypy_cache
-      - run: mypy --ignore-missing-imports --install-types --non-interactive --exclude build/ . || true
-      - run: pytest --ignore=tests/test_utils/test_mjpeg.py
-                    --ignore=tests/test_utils/test_rtmp.py . || true
-      - run: pytest --fixtures tests/test_utils/test_mjpeg.py || true
-      - run: pytest --fixtures tests/test_utils/test_rtmp.py  || true
-      - run: pytest . || pytest --doctest-modules . || true
+      - run: mypy --ignore-missing-imports --install-types --non-interactive --exclude build/ .
+      - run: pytest

.github/workflows/update_locales.yml

@@ -19,11 +19,10 @@ jobs:
       with:
         python-version: '3.x'
         check-latest: true
+        pip-install: babel jinja2
 
-    - name: Install dependencies
+    - name: Install gettext
       run: |
-        python3 -m pip install --upgrade pip setuptools
-        python3 -m pip install --upgrade babel jinja2
         sudo apt-get -q update
         sudo DEBIAN_FRONTEND='noninteractive' apt-get -qq --no-install-recommends install gettext
 
@@ -35,12 +34,15 @@ jobs:
 
     - name: Generate backend template
       run: |
-        pybabel extract --no-wrap -F l10n/babel.cfg -o motioneye/locale/motioneye.pot motioneye/
+        pybabel extract -F l10n/babel.cfg --omit-header --no-wrap -o motioneye/locale/motioneye.pot motioneye/
         # Remove python-format flag, and trailing empty line to satisfy pre-commit
         sed -i -e '/^#, python-format$/d' -e '${/^$/d}' motioneye/locale/motioneye.pot
 
     - name: Generate frontend template
-      run: xgettext --no-wrap --from-code=UTF-8 -o motioneye/locale/motioneye.js.pot motioneye/static/js/*.js l10n/*.js
+      run: |
+        find -name '*.js' ! -name '*.min.js' | xgettext --from-code=UTF-8 --no-wrap -o motioneye/locale/motioneye.js.pot -
+        # Remove header: --omit-header enforces ASCII output, despite --from-code=UTF-8, breaking most of our Esperanto source language accent characters
+        sed -i '/^# SOME DESCRIPTIVE TITLE.$/,/^$/d' motioneye/locale/motioneye.js.pot
 
     - name: Generate frontend locales
       run: |
@@ -63,7 +65,7 @@ jobs:
     - name: Commit changes
       run: |
         git add -A
-        git diff -I '^"POT-Creation-Date: ' --exit-code HEAD && exit 0
+        git diff --exit-code HEAD && exit 0
         git config user.name 'github-actions[bot]'
         git config user.email 'github-actions[bot]@users.noreply.github.com'
         git commit -m 'Update translation files'

.pre-commit-config.yaml

@@ -20,18 +20,18 @@ repos:
       - id: mixed-line-ending
       - id: trailing-whitespace
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.9.2
+    rev: 1.9.4
     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.12.0
+    rev: 26.3.0
     hooks:
       - id: black
         args: [--skip-string-normalization]
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.4.1
+    rev: v2.4.2
     hooks:
       - id: codespell
       # See args in setup.cfg
@@ -50,7 +50,7 @@ repos:
           - --show-source
           - --statistics
   - repo: https://github.com/timothycrosley/isort
-    rev: 7.0.0
+    rev: 8.0.1
     hooks:
       - id: isort
         args: ["--profile", "black", "--filter-files"]

conftest.py

@@ -0,0 +1,18 @@
+"""Pytest configuration."""
+
+import pytest
+
+
+def pytest_collection_modifyitems(config, items):
+    """Modify collected test items to exclude non-test functions from source files."""
+    filtered_items = []
+    for item in items:
+        # Exclude functions that are imported from motioneye package
+        # These are utility/source functions, not actual tests
+        if hasattr(item, 'obj') and hasattr(item.obj, '__module__'):
+            # Skip functions from motioneye.* modules (source code)
+            # Only include actual test functions from tests/ directory
+            if item.obj.__module__.startswith('motioneye.'):
+                continue
+        filtered_items.append(item)
+    items[:] = filtered_items

motioneye/__init__.py

@@ -1 +1 @@
-VERSION = "0.43.1"
+VERSION = "0.44.0b1"