From e23c87114d98fdc6b27fb1ab0646e8baad5aa2cc Mon Sep 17 00:00:00 2001 From: Tom Scholten Date: Mon, 12 Jan 2026 14:27:53 +0100 Subject: [PATCH 01/13] Change to prek --- CHANGELOG.md | 6 ++++++ pyproject.toml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cafd24e..ba79163 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. +## [0.6.2] - 2026-01-12 + +### Changed + +- Migrated pre-commit to prek + ## [0.6.1] - 2026-01-03 ### Added diff --git a/pyproject.toml b/pyproject.toml index 09927a4..7b01a90 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "airos" -version = "0.6.1" +version = "0.6.2" license = "MIT" description = "Ubiquiti airOS module(s) for Python 3." readme = "README.md" From 44bf57ee29cf98a8b48da1979e7a2a89559e93b0 Mon Sep 17 00:00:00 2001 From: Tom Scholten Date: Mon, 12 Jan 2026 14:33:18 +0100 Subject: [PATCH 02/13] Move flow to prek --- .github/workflows/verify.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 393ca0f..e14d309 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -75,13 +75,12 @@ jobs: pip install uv uv venv --seed venv . venv/bin/activate - uv pip install pre-commit -r requirements.txt -r requirements-test.txt - pre-commit install - pre-commit install-hooks - - name: Full pre-commit + uv pip install prek -r requirements.txt -r requirements-test.txt + prek install --install-hooks + - name: Full prek (pre-commit) run: | . venv/bin/activate - SKIP=no-commit-to-branch pre-commit run --show-diff-on-failure --color=always --all-files + SKIP=no-commit-to-branch prek run --show-diff-on-failure --color=always --all-files pytest: runs-on: ubuntu-latest From d3089442c11236bead5d162d805244758d9336f9 Mon Sep 17 00:00:00 2001 From: Tom Scholten Date: Mon, 12 Jan 2026 14:50:00 +0100 Subject: [PATCH 03/13] Update env var --- .github/workflows/verify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index e14d309..af8ad0d 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -3,7 +3,7 @@ name: Latest commit env: CACHE_VERSION: 1 DEFAULT_PYTHON: "3.14" - PRE_COMMIT_HOME: ~/.cache/pre-commit + PREK_HOME: ~/.cache/pre-commit VENV: venv on: From ce1bf4af00e289866e5fb22320e95975db60d876 Mon Sep 17 00:00:00 2001 From: Tom Scholten Date: Mon, 12 Jan 2026 14:55:17 +0100 Subject: [PATCH 04/13] Use new dir --- .github/workflows/verify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index af8ad0d..07675e0 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -3,7 +3,7 @@ name: Latest commit env: CACHE_VERSION: 1 DEFAULT_PYTHON: "3.14" - PREK_HOME: ~/.cache/pre-commit + PREK_HOME: ~/.cache/prek VENV: venv on: From 8c22898c43e0b1bcce9b44219760b267c9b465aa Mon Sep 17 00:00:00 2001 From: Tom Scholten Date: Mon, 12 Jan 2026 15:01:23 +0100 Subject: [PATCH 05/13] Install separately --- .github/workflows/verify.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 07675e0..5dcc95e 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -75,7 +75,8 @@ jobs: pip install uv uv venv --seed venv . venv/bin/activate - uv pip install prek -r requirements.txt -r requirements-test.txt + uv pip install prek + uv pip install -r requirements.txt -r requirements-test.txt prek install --install-hooks - name: Full prek (pre-commit) run: | From 712be7ad69871066e68d167f89aca1ccb00bff60 Mon Sep 17 00:00:00 2001 From: Tom Scholten Date: Mon, 12 Jan 2026 15:04:43 +0100 Subject: [PATCH 06/13] Change dependencies --- .github/workflows/verify.yml | 3 +-- .pre-commit-config.yaml | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 5dcc95e..07675e0 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -75,8 +75,7 @@ jobs: pip install uv uv venv --seed venv . venv/bin/activate - uv pip install prek - uv pip install -r requirements.txt -r requirements-test.txt + uv pip install prek -r requirements.txt -r requirements-test.txt prek install --install-hooks - name: Full prek (pre-commit) run: | diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 20e495c..7f68aaf 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -80,6 +80,7 @@ repos: rev: v0.45.0 hooks: - id: markdownlint + additional_dependencies: [] - repo: local hooks: - id: parsetest From a8bb2a417ecf1786dc7305ed65a73d9a1b1bf2d5 Mon Sep 17 00:00:00 2001 From: Tom Scholten Date: Mon, 12 Jan 2026 15:13:22 +0100 Subject: [PATCH 07/13] Change dependencies --- .pre-commit-config.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7f68aaf..5ca0fed 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -77,10 +77,9 @@ repos: - --keep-updates files: ^(airos|tests|script)/.+\.py$ - repo: https://github.com/igorshubovych/markdownlint-cli - rev: v0.45.0 + rev: v0.47.0 hooks: - id: markdownlint - additional_dependencies: [] - repo: local hooks: - id: parsetest From bf56454e9e89a10e58d8e1d9cda5b61241bf2689 Mon Sep 17 00:00:00 2001 From: Tom Scholten Date: Mon, 12 Jan 2026 15:16:31 +0100 Subject: [PATCH 08/13] Change dependencies --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5ca0fed..ea83d5f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -76,10 +76,10 @@ repos: - --force - --keep-updates files: ^(airos|tests|script)/.+\.py$ - - repo: https://github.com/igorshubovych/markdownlint-cli - rev: v0.47.0 + - repo: https://github.com/DavidAnson/markdownlint-cli2 + rev: v0.20.0 hooks: - - id: markdownlint + - id: markdownlint-cli2 - repo: local hooks: - id: parsetest From 7db70b17f4a2c42b5802a048ea435a2c99dab5af Mon Sep 17 00:00:00 2001 From: Tom Scholten Date: Mon, 12 Jan 2026 15:26:58 +0100 Subject: [PATCH 09/13] Change dependencies --- .github/workflows/verify.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 07675e0..6ecf1bb 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -77,6 +77,10 @@ jobs: . venv/bin/activate uv pip install prek -r requirements.txt -r requirements-test.txt prek install --install-hooks + - name: Inspect prek cache repos + run: | + echo "=== PREK CACHE ===" + ls -R ~/.cache/prek/repos || true - name: Full prek (pre-commit) run: | . venv/bin/activate From e1e42c34d10ee6a8780a6623160d0cc96d648d63 Mon Sep 17 00:00:00 2001 From: Tom Scholten Date: Mon, 12 Jan 2026 15:31:06 +0100 Subject: [PATCH 10/13] Change dependencies --- .github/workflows/verify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 6ecf1bb..f939200 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -76,7 +76,7 @@ jobs: uv venv --seed venv . venv/bin/activate uv pip install prek -r requirements.txt -r requirements-test.txt - prek install --install-hooks + prek install --install-hooks || true - name: Inspect prek cache repos run: | echo "=== PREK CACHE ===" From c7083f10bdf2d60c52242dd6086cb762c0f7ccc6 Mon Sep 17 00:00:00 2001 From: Tom Scholten Date: Mon, 12 Jan 2026 15:50:21 +0100 Subject: [PATCH 11/13] Move to pymarkdown --- .github/workflows/verify.yml | 6 +----- .pre-commit-config.yaml | 12 ++++++------ .pymarkdown | 1 + 3 files changed, 8 insertions(+), 11 deletions(-) create mode 100644 .pymarkdown diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index f939200..505b0b1 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -76,11 +76,7 @@ jobs: uv venv --seed venv . venv/bin/activate uv pip install prek -r requirements.txt -r requirements-test.txt - prek install --install-hooks || true - - name: Inspect prek cache repos - run: | - echo "=== PREK CACHE ===" - ls -R ~/.cache/prek/repos || true + prek install - name: Full prek (pre-commit) run: | . venv/bin/activate diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ea83d5f..eb08d28 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -41,7 +41,7 @@ repos: exclude_types: [csv, json] exclude: ^userdata/|^fixtures/ - repo: https://github.com/PyCQA/bandit - rev: 1.8.6 + rev: 1.9.2 hooks: - id: bandit name: "Bandit checking" @@ -56,14 +56,14 @@ repos: - id: yamllint name: "YAML linting" - repo: https://github.com/shellcheck-py/shellcheck-py - rev: v0.10.0.1 + rev: v0.11.0.1 hooks: - id: shellcheck name: "Shell checking" args: - --external-sources - repo: https://github.com/cdce8p/python-typing-update - rev: v0.7.3 + rev: v0.8.1 hooks: # Run `python-typing-update` hook manually from time to time # to update python typing syntax. @@ -76,10 +76,10 @@ repos: - --force - --keep-updates files: ^(airos|tests|script)/.+\.py$ - - repo: https://github.com/DavidAnson/markdownlint-cli2 - rev: v0.20.0 + - repo: https://github.com/jackdewinter/pymarkdown + rev: v0.9.34 hooks: - - id: markdownlint-cli2 + - id: pymarkdown - repo: local hooks: - id: parsetest diff --git a/.pymarkdown b/.pymarkdown new file mode 100644 index 0000000..bf4eee9 --- /dev/null +++ b/.pymarkdown @@ -0,0 +1 @@ +{ "plugins": { "md013": { "enabled": false }, "md024": { "enabled": false }, "md033": { "enabled": false }, "md041": { "enabled": false } } } From 6350542020af0c09ed580ebecafbd94e1d50caa1 Mon Sep 17 00:00:00 2001 From: Tom Scholten Date: Mon, 12 Jan 2026 15:52:10 +0100 Subject: [PATCH 12/13] Update names --- .pre-commit-config.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index eb08d28..964bb76 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -80,6 +80,7 @@ repos: rev: v0.9.34 hooks: - id: pymarkdown + name: MarkDown Lint - repo: local hooks: - id: parsetest @@ -91,20 +92,20 @@ repos: files: ^(airos|tests|script)/.+\.py$|^fixtures/userdata/.+\.json$ pass_filenames: false - id: pytest - name: "pytest" + name: "Testing using pytest" entry: script/run-in-env.sh pytest --log-level info tests/ --cov='airos/' language: script types: [python] pass_filenames: false files: ^(airos|tests|script)/.+\.py$ - id: pylint - name: "pylinting" + name: "Linting with pylint" entry: script/run-in-env.sh pylint -j 0 language: script types: [python] files: ^(airos|tests|script)/.+\.py$ - id: mypy - name: mypy + name: "Typing check using mypy" entry: script/run-in-env.sh mypy language: script require_serial: true From 0c994794f8edbc6a48dd2ceed980aab07e859c83 Mon Sep 17 00:00:00 2001 From: Tom Scholten Date: Mon, 12 Jan 2026 15:52:47 +0100 Subject: [PATCH 13/13] Cleanup --- .markdownlint.yaml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .markdownlint.yaml diff --git a/.markdownlint.yaml b/.markdownlint.yaml deleted file mode 100644 index c5006e5..0000000 --- a/.markdownlint.yaml +++ /dev/null @@ -1,5 +0,0 @@ -default: true -MD013: false -MD024: false -MD033: false -MD041: false