From e59ad8464dfa96a1da57788a5d1664f73e8892d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jun 2026 00:12:52 +0000 Subject: [PATCH 1/3] CI(dependabot): Bump actions/checkout from 6 to 7 Bumps [actions/checkout](https://github.com/actions/checkout) from 6 to 7. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v6...v7) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/commitlint.yml | 2 +- .github/workflows/publish-sdist.yml | 2 +- .github/workflows/run-tox.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml index ff3c640..e63f26a 100644 --- a/.github/workflows/commitlint.yml +++ b/.github/workflows/commitlint.yml @@ -11,7 +11,7 @@ jobs: env: PR_TITLE: ${{ github.event.pull_request.title }} steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - uses: actions/setup-node@v6 with: node-version: '20' diff --git a/.github/workflows/publish-sdist.yml b/.github/workflows/publish-sdist.yml index d99216c..a3c4c0e 100644 --- a/.github/workflows/publish-sdist.yml +++ b/.github/workflows/publish-sdist.yml @@ -10,7 +10,7 @@ jobs: name: Build and publish on PyPI runs-on: ubuntu-latest steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Set up Python 3.10 uses: actions/setup-python@v6 with: diff --git a/.github/workflows/run-tox.yml b/.github/workflows/run-tox.yml index 9147af5..0574a07 100644 --- a/.github/workflows/run-tox.yml +++ b/.github/workflows/run-tox.yml @@ -24,7 +24,7 @@ jobs: min_versions: "min_versions" steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v6 with: From 8ccf77809bc5ea4d4c82596c0063a12d4e413176 Mon Sep 17 00:00:00 2001 From: Adrien Berchet Date: Mon, 22 Jun 2026 09:27:06 +0200 Subject: [PATCH 2/3] CI: Use tox-uv --- .github/workflows/run-tox.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tox.yml b/.github/workflows/run-tox.yml index 0574a07..8373f57 100644 --- a/.github/workflows/run-tox.yml +++ b/.github/workflows/run-tox.yml @@ -49,13 +49,13 @@ jobs: if: ${{ matrix.min_versions == 'latest_versions' }} run: | python -m pip install --upgrade pip setuptools - pip install tox-gh-actions + pip install tox-uv tox-gh-actions tox - name: Run tox with min versions if: ${{ matrix.min_versions == 'min_versions' }} run: | python -m pip install --upgrade pip setuptools - pip install tox + pip install tox-uv tox run -e min_versions - name: JUnit Report Action uses: mikepenz/action-junit-report@v6 From 5d649adc1b989813e7bd1e722b5f5786e7aed3a5 Mon Sep 17 00:00:00 2001 From: Adrien Berchet Date: Mon, 22 Jun 2026 09:57:29 +0200 Subject: [PATCH 3/3] CI: Use pref instead of pre-commit --- .github/workflows/run-tox.yml | 4 ++-- .pre-commit-config.yaml | 4 ++++ tests/test_parallel_execution.py | 10 +++++----- tox.ini | 8 ++++---- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.github/workflows/run-tox.yml b/.github/workflows/run-tox.yml index 8373f57..ff8b39f 100644 --- a/.github/workflows/run-tox.yml +++ b/.github/workflows/run-tox.yml @@ -35,12 +35,12 @@ jobs: - name: Install APT Packages run: | sudo apt-get install -y poppler-utils imagemagick - - name: Cache tox and precommit environments + - name: Cache tox and prek environments uses: actions/cache@v5 with: path: | .tox - ~/.cache/pre-commit + ~/.cache/prek key: ${{ runner.os }}-${{ matrix.python-version }}-${{ steps.date.outputs.date }}-${{ hashFiles('setup.py') }}-${{ hashFiles('.pre-commit-config.yaml') }} - name: Clear results in tox environments run: | diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8321d73..9a0946a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,3 +1,7 @@ +default_install_hook_types: + - pre-commit + - commit-msg + repos: - repo: https://github.com/astral-sh/ruff-pre-commit rev: v0.7.0 diff --git a/tests/test_parallel_execution.py b/tests/test_parallel_execution.py index 7f7ca7f..0c0c63c 100644 --- a/tests/test_parallel_execution.py +++ b/tests/test_parallel_execution.py @@ -187,11 +187,11 @@ def test_parallel_single_file_fallback( generate_test_files.create_json(empty_res_tree / "file.json") # Mock the parallel executors and configure logs - with patch( - "concurrent.futures.ThreadPoolExecutor" - ) as mock_thread_executor, patch( - "concurrent.futures.ProcessPoolExecutor" - ) as mock_process_executor, caplog.at_level(logging.DEBUG): + with ( + patch("concurrent.futures.ThreadPoolExecutor") as mock_thread_executor, + patch("concurrent.futures.ProcessPoolExecutor") as mock_process_executor, + caplog.at_level(logging.DEBUG), + ): result = compare_trees( empty_ref_tree, empty_res_tree, executor_type="thread", max_workers=4 ) diff --git a/tox.ini b/tox.ini index b801660..0a7d3e9 100644 --- a/tox.ini +++ b/tox.ini @@ -85,10 +85,10 @@ commands = [testenv:lint] basepython = python3.9 deps = - pre-commit + prek pylint commands = - pre-commit run --all-files --show-diff-on-failure + prek run --all-files --show-diff-on-failure pylint -j {env:PYLINT_NPROCS:1} {[base]files} [testenv:format] @@ -96,10 +96,10 @@ basepython = python3.9 skip_install = true deps = codespell - pre-commit + prek commands = codespell -i 3 -x .codespellignorelines -w {[base]files} README.md CHANGELOG.md docs/source - pre-commit run --all-files + prek run --all-files [testenv:docs] changedir = docs