Commit b7ce712
committed
Use newer ruff style
This updates `ruff` in `.pre-commit-config.yaml` from 0.6.0 to
0.11.12, changes its `id` from the legacy `ruff` alias to
`ruff-check` (which is better distinguished from `ruff-format`,
which we also have a hook for), and applies the few style changes
it newly recommends throughout the code. The style changes seem to
make things slightly clearer overall.
This also updates some other pre-commit hooks, but those don't
require any changes to the code.
Currently the `ruff` dependency in `requirements-dev.txt` doesn't
specify a version, so no change is needed there. This update may
be seen as bringing the `pre-commit` version in line with what
users will usually have locally with `pip install -e ".[test]"`.
The `pre-commit` hooks are how linting is currently done on CI, so
this is updating `ruff` for CI. That's the most significant effect
of this change. (`pre-commit` is run for linting on CI probably
much more often than it is used locally, to manage pre-commit
hooks or otherwise, in GitPython development.)1 parent 8576534 commit b7ce712
6 files changed
Lines changed: 11 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,15 +1,15 @@ | |||
| 1 | 1 | repos: | |
| 2 | 2 | - repo: https://github.com/codespell-project/codespell | |
| 3 | - rev: v2.3.0 | ||
| 3 | + rev: v2.4.1 | ||
| 4 | 4 | hooks: | |
| 5 | 5 | - id: codespell | |
| 6 | 6 | additional_dependencies: [tomli] | |
| 7 | 7 | exclude: ^test/fixtures/ | |
| 8 | 8 | ||
| 9 | 9 | - repo: https://github.com/astral-sh/ruff-pre-commit | |
| 10 | - rev: v0.6.0 | ||
| 10 | + rev: v0.11.12 | ||
| 11 | 11 | hooks: | |
| 12 | - - id: ruff | ||
| 12 | + - id: ruff-check | ||
| 13 | 13 | args: ["--fix"] | |
| 14 | 14 | exclude: ^git/ext/ | |
| 15 | 15 | - id: ruff-format | |
@@ -23,7 +23,7 @@ repos: | |||
| 23 | 23 | exclude: ^test/fixtures/polyglot$|^git/ext/ | |
| 24 | 24 | ||
| 25 | 25 | - repo: https://github.com/pre-commit/pre-commit-hooks | |
| 26 | - rev: v4.6.0 | ||
| 26 | + rev: v5.0.0 | ||
| 27 | 27 | hooks: | |
| 28 | 28 | - id: end-of-file-fixer | |
| 29 | 29 | exclude: ^test/fixtures/|COPYING|LICENSE | |
@@ -33,6 +33,6 @@ repos: | |||
| 33 | 33 | - id: check-merge-conflict | |
| 34 | 34 | ||
| 35 | 35 | - repo: https://github.com/abravalheri/validate-pyproject | |
| 36 | - rev: v0.19 | ||
| 36 | + rev: v0.24.1 | ||
| 37 | 37 | hooks: | |
| 38 | 38 | - id: validate-pyproject | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -207,7 +207,7 @@ def pump_stream( | |||
| 207 | 207 | ) | |
| 208 | 208 | if stderr_handler: | |
| 209 | 209 | error_str: Union[str, bytes] = ( | |
| 210 | - "error: process killed because it timed out." f" kill_after_timeout={kill_after_timeout} seconds" | ||
| 210 | + f"error: process killed because it timed out. kill_after_timeout={kill_after_timeout} seconds" | ||
| 211 | 211 | ) | |
| 212 | 212 | if not decode_streams and isinstance(p_stderr, BinaryIO): | |
| 213 | 213 | # Assume stderr_handler needs binary input. | |
@@ -1319,7 +1319,7 @@ def communicate() -> Tuple[AnyStr, AnyStr]: | |||
| 1319 | 1319 | out, err = proc.communicate() | |
| 1320 | 1320 | watchdog.cancel() | |
| 1321 | 1321 | if kill_check.is_set(): | |
| 1322 | - err = 'Timeout: the command "%s" did not complete in %d ' "secs." % ( | ||
| 1322 | + err = 'Timeout: the command "%s" did not complete in %d secs.' % ( | ||
| 1323 | 1323 | " ".join(redacted_command), | |
| 1324 | 1324 | timeout, | |
| 1325 | 1325 | ) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -126,7 +126,7 @@ def from_line(cls, line: bytes) -> "RefLogEntry": | |||
| 126 | 126 | elif len(fields) == 2: | |
| 127 | 127 | info, msg = fields | |
| 128 | 128 | else: | |
| 129 | - raise ValueError("Line must have up to two TAB-separated fields." " Got %s" % repr(line_str)) | ||
| 129 | + raise ValueError("Line must have up to two TAB-separated fields. Got %s" % repr(line_str)) | ||
| 130 | 130 | # END handle first split | |
| 131 | 131 | ||
| 132 | 132 | oldhexsha = info[:40] | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -405,7 +405,7 @@ def rev_parse(repo: "Repo", rev: str) -> AnyGitObject: | |||
| 405 | 405 | # END end handle tag | |
| 406 | 406 | except (IndexError, AttributeError) as e: | |
| 407 | 407 | raise BadName( | |
| 408 | - f"Invalid revision spec '{rev}' - not enough " f"parent commits to reach '{token}{int(num)}'" | ||
| 408 | + f"Invalid revision spec '{rev}' - not enough parent commits to reach '{token}{int(num)}'" | ||
| 409 | 409 | ) from e | |
| 410 | 410 | # END exception handling | |
| 411 | 411 | # END parse loop | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -747,7 +747,7 @@ def test_environment(self, rw_dir): | |||
| 747 | 747 | ||
| 748 | 748 | path = osp.join(rw_dir, "failing-script.sh") | |
| 749 | 749 | with open(path, "wt") as stream: | |
| 750 | - stream.write("#!/usr/bin/env sh\n" "echo FOO\n") | ||
| 750 | + stream.write("#!/usr/bin/env sh\necho FOO\n") | ||
| 751 | 751 | os.chmod(path, 0o777) | |
| 752 | 752 | ||
| 753 | 753 | rw_repo = Repo.init(osp.join(rw_dir, "repo")) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -173,7 +173,7 @@ def test_cloned_repo_object(self, local_dir): | |||
| 173 | 173 | # [15-test_cloned_repo_object] | |
| 174 | 174 | def print_files_from_git(root, level=0): | |
| 175 | 175 | for entry in root: | |
| 176 | - print(f'{"-" * 4 * level}| {entry.path}, {entry.type}') | ||
| 176 | + print(f"{'-' * 4 * level}| {entry.path}, {entry.type}") | ||
| 177 | 177 | if entry.type == "tree": | |
| 178 | 178 | print_files_from_git(entry, level + 1) | |
| 179 | 179 | ||
0 commit comments