From ff2c5574249d4ff9c49c2c67456904657e2e9fe1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 23:58:08 +0000 Subject: [PATCH 1/4] Bump pyproject-fmt from 1.8.0 to 2.1.1 Bumps [pyproject-fmt](https://github.com/tox-dev/pyproject-fmt) from 1.8.0 to 2.1.1. - [Release notes](https://github.com/tox-dev/pyproject-fmt/releases) - [Commits](https://github.com/tox-dev/pyproject-fmt/compare/1.8.0...2.1.1) --- updated-dependencies: - dependency-name: pyproject-fmt dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 17c1b4c51..40979b60b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -298,7 +298,7 @@ dev = [ "pydocstyle==6.3", "pyenchant==3.2.2", "pylint==3.2.0", - "pyproject-fmt==1.8.0", + "pyproject-fmt==2.1.1", "pyright==1.1.362", "pyroma==4.2", "pytest==8.2.0", From 73b276faa32344c3dbe5c2cf0c4e7564e5dfaa01 Mon Sep 17 00:00:00 2001 From: Adam Dangoor Date: Thu, 16 May 2024 01:08:25 +0100 Subject: [PATCH 2/4] Empty commit for CI From cd36d21f78efd561da914cf3f6d2022b109d55b6 Mon Sep 17 00:00:00 2001 From: Adam Dangoor Date: Thu, 16 May 2024 01:14:01 +0100 Subject: [PATCH 3/4] Remove ruff / pyproject-fmt hooks which just check --- .github/workflows/lint.yml | 2 ++ .pre-commit-config.yaml | 19 ------------------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index f09270f0d..7714af4ee 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -40,5 +40,7 @@ jobs: pre-commit run --all-files --hook-stage push --verbose pre-commit run --all-files --hook-stage manual --verbose + - uses: pre-commit/action@v3.0.1 + - uses: pre-commit-ci/lite-action@v1.0.2 if: always() diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 514379cd2..d6afa00c9 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -95,18 +95,6 @@ repos: # want. entry: ghcr.io/hadolint/hadolint hadolint - - id: ruff-check - name: Ruff check - entry: ruff check - language: system - types: [python] - - - id: ruff-format-check - name: Ruff format check - entry: ruff format --check - language: system - types: [python] - - id: ruff-check-fix name: Ruff check fix entry: ruff check --fix @@ -125,13 +113,6 @@ repos: language: system types: [rst] - - id: pyproject-fmt-check - name: pyproject-fmt check - entry: pyproject-fmt --check - language: system - types: [toml] - files: pyproject.toml - - id: pyproject-fmt-fix name: pyproject-fmt entry: pyproject-fmt From 618a50306615ab02efec6c1b9d49b6fd758b78c7 Mon Sep 17 00:00:00 2001 From: Adam Dangoor Date: Thu, 16 May 2024 01:19:49 +0100 Subject: [PATCH 4/4] Try using pre-commit ci for the lite action --- .github/workflows/lint.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 7714af4ee..f09270f0d 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -40,7 +40,5 @@ jobs: pre-commit run --all-files --hook-stage push --verbose pre-commit run --all-files --hook-stage manual --verbose - - uses: pre-commit/action@v3.0.1 - - uses: pre-commit-ci/lite-action@v1.0.2 if: always()