From 33bd06db70dbdc554f1e82707953c82f6aa4249b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 16:51:56 +0000 Subject: [PATCH 1/4] chore(deps): pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/python-jsonschema/check-jsonschema: 0.27.3 → 0.27.4](https://github.com/python-jsonschema/check-jsonschema/compare/0.27.3...0.27.4) - [github.com/astral-sh/ruff-pre-commit: v0.1.9 → v0.2.0](https://github.com/astral-sh/ruff-pre-commit/compare/v0.1.9...v0.2.0) - [github.com/psf/black: 23.12.1 → 24.1.1](https://github.com/psf/black/compare/23.12.1...24.1.1) - [github.com/tox-dev/pyproject-fmt: 1.5.3 → 1.7.0](https://github.com/tox-dev/pyproject-fmt/compare/1.5.3...1.7.0) - [github.com/pycqa/flake8: 6.1.0 → 7.0.0](https://github.com/pycqa/flake8/compare/6.1.0...7.0.0) --- .pre-commit-config.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 48338a4..30b6306 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: check-added-large-files - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.27.3 + rev: 0.27.4 hooks: - id: check-dependabot - id: check-github-workflows @@ -27,18 +27,18 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit # Ruff version. - rev: v0.1.9 + rev: v0.2.0 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] - repo: https://github.com/psf/black - rev: 23.12.1 + rev: 24.1.1 hooks: - id: black - repo: https://github.com/tox-dev/pyproject-fmt - rev: "1.5.3" + rev: "1.7.0" hooks: - id: pyproject-fmt @@ -51,6 +51,6 @@ repos: - sqlalchemy[mypy] - repo: https://github.com/pycqa/flake8 - rev: 6.1.0 + rev: 7.0.0 hooks: - id: flake8 From 4aad2753f7872e13c54ee97a3653d257d071263e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 16:52:25 +0000 Subject: [PATCH 2/4] [pre-commit.ci] auto fixes --- tests/conftest.py | 1 + tests/test_core.py | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/conftest.py b/tests/conftest.py index 4133230..3a8eaea 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,4 +1,5 @@ """Test Configuration.""" + from __future__ import annotations pytest_plugins = ("singer_sdk.testing.pytest_plugin",) diff --git a/tests/test_core.py b/tests/test_core.py index 6c6fbf1..e7c9a8b 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -1,4 +1,5 @@ """Tests standard tap features using the built-in SDK tests library.""" + from __future__ import annotations import json From 02a2e75a8d49c3bafe25ecf75455ff7746a3534b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edgar=20Ram=C3=ADrez-Mondrag=C3=B3n?= Date: Mon, 5 Feb 2024 11:34:32 -0600 Subject: [PATCH 3/4] chore: Remove redundant pre-commit hooks --- .flake8 | 4 ---- .pre-commit-config.yaml | 11 +---------- pyproject.toml | 18 ++++++++++-------- 3 files changed, 11 insertions(+), 22 deletions(-) delete mode 100644 .flake8 diff --git a/.flake8 b/.flake8 deleted file mode 100644 index 5a1bf64..0000000 --- a/.flake8 +++ /dev/null @@ -1,4 +0,0 @@ -[flake8] -select = DAR -docstring-convention = google -max-line-length = 88 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 30b6306..e549926 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -31,11 +31,7 @@ repos: hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] - -- repo: https://github.com/psf/black - rev: 24.1.1 - hooks: - - id: black + - id: ruff-format - repo: https://github.com/tox-dev/pyproject-fmt rev: "1.7.0" @@ -49,8 +45,3 @@ repos: additional_dependencies: - typing-extensions - sqlalchemy[mypy] - -- repo: https://github.com/pycqa/flake8 - rev: 7.0.0 - hooks: - - id: flake8 diff --git a/pyproject.toml b/pyproject.toml index 6c222c5..8691c37 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,6 +28,10 @@ python_version = "3.9" warn_unused_configs = true [tool.ruff] +line-length = 88 +target-version = "py38" + +[tool.ruff.lint] select = [ "F", "W", @@ -86,28 +90,26 @@ ignore = [ unfixable = [ "ERA", # commented-out-code ] -line-length = 88 -target-version = "py37" -[tool.ruff.flake8-import-conventions] +[tool.ruff.lint.flake8-import-conventions] banned-from = ["typing"] -[tool.ruff.flake8-import-conventions.extend-aliases] +[tool.ruff.lint.flake8-import-conventions.extend-aliases] "typing" = "t" -[tool.ruff.isort] +[tool.ruff.lint.isort] required-imports = ["from __future__ import annotations"] -[tool.ruff.per-file-ignores] +[tool.ruff.lint.per-file-ignores] "tests/*" = ["S101"] -[tool.ruff.pydocstyle] +[tool.ruff.lint.pydocstyle] convention = "google" [build-system] build-backend = "poetry.core.masonry.api" requires = [ - "poetry-core==1.6.*", + "poetry-core==1.9", ] [tool.poetry.scripts] From a73c7de4a178ff704221dd7b945ede020f38051a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edgar=20Ram=C3=ADrez-Mondrag=C3=B3n?= Date: Mon, 5 Feb 2024 11:36:11 -0600 Subject: [PATCH 4/4] Skip dependabot check in CI --- .pre-commit-config.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e549926..0c5de07 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,6 +5,8 @@ ci: autofix_prs: true autoupdate_schedule: monthly autoupdate_commit_msg: 'chore(deps): pre-commit autoupdate' + skip: + - check-dependabot default_language_version: python: python3.11