Skip to content

Commit 505e250

Browse files
authored
Merge pull request #3362 from motioneye-project/beta
Release 0.44.0
2 parents 358fb6d + 03eed88 commit 505e250

210 files changed

Lines changed: 32175 additions & 23721 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitattributes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
* text=auto
2+
*.sh text eol=lf
3+
linux_init text eol=lf
4+
po2json text eol=lf
5+
*.py text eol=lf

.github/dependabot.yaml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
# To get started with Dependabot version updates, you'll need to specify which
2-
# package ecosystems to update and where the package manifests are located.
3-
# Please see the documentation for all configuration options:
4-
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5-
61
version: 2
72

83
updates:
94
- package-ecosystem: "github-actions"
10-
# Workflow files stored in the default location of `.github/workflows`
115
directory: "/"
126
schedule:
137
interval: "daily"
148
target-branch: "dev"
159
labels:
1610
- "CI/CD"
11+
12+
# For Python dependencies, a PEP 751 pyproject.lock is needed, which we do not maintain, intentionally.
13+
#- package-ecosystem: "pip"
14+
# directory: "/"
15+
# schedule:
16+
# interval: "daily"
17+
# target-branch: "dev"
18+
# labels:
19+
# - "dependencies"

.github/workflows/docker.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,40 +18,44 @@ jobs:
1818
packages: write
1919

2020
steps:
21-
- uses: docker/metadata-action@v5
21+
- uses: docker/metadata-action@v6
2222
id: meta
2323
with:
2424
images: |
2525
motioneyeproject/motioneye
2626
ghcr.io/${{ github.repository_owner }}/motioneye
27+
flavor: latest=false
2728
tags: |
2829
type=edge,branch=dev
2930
type=semver,pattern={{version}}
3031
type=semver,pattern={{major}}.{{minor}}
3132
type=semver,pattern={{major}}
33+
type=match,pattern=\d+\.\d+\.\d+b\d+
34+
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, '-') }}
35+
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, '-') }}
3236
33-
- uses: docker/setup-qemu-action@v3
37+
- uses: docker/setup-qemu-action@v4
3438
with:
3539
cache-image: false
3640

37-
- uses: docker/setup-buildx-action@v3
41+
- uses: docker/setup-buildx-action@v4
3842

3943
- name: Login to Docker Hub
40-
uses: docker/login-action@v3
44+
uses: docker/login-action@v4
4145
if: github.event_name == 'push' && github.repository == 'motioneye-project/motioneye' && steps.meta.outputs.tags != null
4246
with:
4347
username: ${{ secrets.DOCKER_USERNAME }}
4448
password: ${{ secrets.DOCKER_TOKEN }}
4549

4650
- name: Login to GitHub Container Registry
47-
uses: docker/login-action@v3
51+
uses: docker/login-action@v4
4852
if: github.event_name == 'push' && github.repository == 'motioneye-project/motioneye' && steps.meta.outputs.tags != null
4953
with:
5054
registry: ghcr.io
5155
username: ${{ github.actor }}
5256
password: ${{ github.token }}
5357

54-
- uses: docker/build-push-action@v6
58+
- uses: docker/build-push-action@v7
5559
with:
5660
file: ./docker/Dockerfile
5761
platforms: linux/amd64,linux/arm64/v8,linux/arm/v7,linux/riscv64

.github/workflows/pip_audit.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: pip_audit
2+
3+
on: [pull_request, push]
4+
5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.ref }}
7+
cancel-in-progress: true
8+
9+
permissions:
10+
contents: read
11+
12+
jobs:
13+
pip_audit:
14+
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login != github.event.pull_request.base.repo.owner.login
15+
runs-on: ubuntu-24.04
16+
steps:
17+
- uses: actions/checkout@v7
18+
- uses: actions/setup-python@v6
19+
with:
20+
python-version: 3.x
21+
check-latest: true
22+
pip-install: pip-audit
23+
- run: pip-audit -Sv .

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
pre-commit-autoupdate:
1616
runs-on: ubuntu-24.04
1717
steps:
18-
- uses: actions/checkout@v6
18+
- uses: actions/checkout@v7
1919
with:
2020
ref: dev
2121
# https://github.com/peter-evans/create-pull-request/issues/48

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login != github.event.pull_request.base.repo.owner.login
1717
runs-on: ubuntu-24.04
1818
steps:
19-
- uses: actions/checkout@v6
19+
- uses: actions/checkout@v7
2020
- uses: actions/setup-python@v6
2121
with:
2222
python-version: '3.x'

.github/workflows/pypi_release.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: PyPI release
22

3-
on: workflow_dispatch
3+
on:
4+
workflow_dispatch:
5+
push:
6+
tags:
7+
- '[0-9]+.[0-9]+.[0-9]+b?[1-9]?'
48

59
permissions:
610
contents: read
@@ -9,7 +13,7 @@ jobs:
913
release:
1014
runs-on: ubuntu-24.04
1115
steps:
12-
- uses: actions/checkout@v6
16+
- uses: actions/checkout@v7
1317
- uses: actions/setup-python@v6
1418
with:
1519
python-version: '3.x'

.github/workflows/python_safety.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

.github/workflows/shellcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
command -v xz && exit 0
2020
sudo apt-get -q update
2121
sudo DEBIAN_FRONTEND=noninteractive apt-get -qq --no-install-recommends install xz-utils
22-
- uses: actions/checkout@v6
22+
- uses: actions/checkout@v7
2323
- name: Download shellcheck
2424
run: |
2525
curl -sSfLo shellcheck.tar.xz "$(curl -sSfH 'Authorization: Bearer ${{ github.token }}' 'https://api.github.com/repos/koalaman/shellcheck/releases/latest' | mawk -F\" '/"browser_download_url.*\.linux\.x86_64\.tar\.xz"/{print $4;exit}')"

.github/workflows/test_python.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,17 @@ jobs:
1515
strategy:
1616
matrix:
1717
include:
18+
# Tests with oldest Python version able to build the project on oldest available runner images
19+
- { dist: 'ubuntu-22.04', python: '3.9' }
20+
- { dist: 'ubuntu-22.04-arm', python: '3.9' }
1821
# https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=python3
1922
- { dist: 'ubuntu-22.04', python: '3.10.6' }
2023
- { dist: 'ubuntu-24.04', python: '3.12.3' }
24+
# No Python 3.14 supported for ubuntu-26.04 runners yet: https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json
25+
- { dist: 'ubuntu-24.04', python: '3.14.3' }
2126
- { dist: 'ubuntu-22.04-arm', python: '3.10.6' }
2227
- { dist: 'ubuntu-24.04-arm', python: '3.12.3' }
28+
- { dist: 'ubuntu-24.04-arm', python: '3.14.3' }
2329
fail-fast: false
2430
runs-on: ${{ matrix.dist }}
2531
name: "Test on ${{ matrix.dist }}"
@@ -30,10 +36,10 @@ jobs:
3036
# error: externally-managed-environment
3137
echo -e '[global]\nbreak-system-packages=true' | sudo tee /etc/pip.conf
3238
# ERROR: Cannot uninstall pip 24.0, RECORD file not found. Hint: The package was installed by debian.
33-
- run: sudo DEBIAN_FRONTEND="noninteractive" apt-get -qq autopurge python3-pip python3-setuptools python3-wheel
39+
- run: sudo DEBIAN_FRONTEND='noninteractive' apt-get -qq autopurge python3-pip python3-setuptools python3-wheel
3440
- run: sudo apt-get -q update
35-
- run: sudo DEBIAN_FRONTEND="noninteractive" apt-get -qq --no-install-recommends install curl ffmpeg motion v4l-utils
36-
- uses: actions/checkout@v6
41+
- run: sudo DEBIAN_FRONTEND='noninteractive' apt-get -qq --no-install-recommends install curl ffmpeg motion v4l-utils
42+
- uses: actions/checkout@v7
3743
- uses: actions/setup-python@v6
3844
with:
3945
python-version: ${{ matrix.python }}
@@ -42,9 +48,5 @@ jobs:
4248
- run: python3 -m build
4349
- run: python3 -m pip install .
4450
- run: mkdir --parents --verbose .mypy_cache
45-
- run: mypy --ignore-missing-imports --install-types --non-interactive --exclude build/ . || true
46-
- run: pytest --ignore=tests/test_utils/test_mjpeg.py
47-
--ignore=tests/test_utils/test_rtmp.py . || true
48-
- run: pytest --fixtures tests/test_utils/test_mjpeg.py || true
49-
- run: pytest --fixtures tests/test_utils/test_rtmp.py || true
50-
- run: pytest . || pytest --doctest-modules . || true
51+
- run: mypy --ignore-missing-imports --install-types --non-interactive --exclude build/ .
52+
- run: pytest

0 commit comments

Comments
 (0)