Skip to content

[pre-commit.ci] pre-commit autoupdate #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hugovk merged 6 commits into from
Apr 8, 2026
Merged

[pre-commit.ci] pre-commit autoupdate #177

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ca5b2e9
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Apr 6, 2026
707cd2c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 6, 2026
39fb100
Update URL
hugovk Apr 8, 2026
e0f70de
Fix S607 start-process-with-partial-path
hugovk Apr 8, 2026
e09216f
Remove Codecov token
hugovk Apr 8, 2026
47a4776
core-workfolow -> core-workflow
hugovk Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ jobs:
with:
flags: ${{ matrix.os }}
name: ${{ matrix.os }} Python ${{ matrix.python-version }}
token: ${{ secrets.CODECOV_ORG_TOKEN }}
20 changes: 10 additions & 10 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.14.10
rev: v0.15.9
hooks:
- id: ruff-check
args: [--exit-non-zero-on-fix]

- repo: https://github.com/psf/black-pre-commit-mirror
rev: 25.12.0
rev: 26.3.1
hooks:
- id: black

Expand All @@ -25,18 +25,18 @@ repos:
- id: trailing-whitespace

- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.36.0
rev: 0.37.1
hooks:
- id: check-dependabot
- id: check-github-workflows

- repo: https://github.com/rhysd/actionlint
rev: v1.7.10
rev: v1.7.12
hooks:
- id: actionlint

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.19.1
rev: v1.20.0
hooks:
- id: mypy
args:
Expand All @@ -49,18 +49,18 @@ repos:
pass_filenames: false
additional_dependencies: ["types-requests"]

- repo: https://github.com/woodruffw/zizmor-pre-commit
rev: v1.14.2
- repo: https://github.com/zizmorcore/zizmor-pre-commit
rev: v1.23.1
hooks:
- id: zizmor

- repo: https://github.com/tox-dev/pyproject-fmt
rev: v2.11.1
rev: v2.21.0
hooks:
- id: pyproject-fmt

- repo: https://github.com/abravalheri/validate-pyproject
rev: v0.24.1
rev: v0.25
hooks:
- id: validate-pyproject

Expand All @@ -70,7 +70,7 @@ repos:
- id: tox-ini-fmt

- repo: https://github.com/codespell-project/codespell
rev: v2.4.1
rev: v2.4.2
hooks:
- id: codespell
args: [--ignore-words-list=commitish]
Expand Down
6 changes: 2 additions & 4 deletions cherry_picker/cherry_picker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,8 +398,7 @@ def amend_commit_message(self, cherry_pick_branch):
return updated_commit_message

def pause_after_committing(self, cherry_pick_branch):
click.echo(
f"""
click.echo(f"""
Finished cherry-pick {self.commit_sha1} into {cherry_pick_branch} \U0001f600
--no-push option used.
... Stopping here.
Expand All @@ -408,8 +407,7 @@ def pause_after_committing(self, cherry_pick_branch):

To abort the cherry-pick and cleanup:
$ cherry_picker --abort
"""
)
""")
self.set_paused_state()

def push_to_remote(self, base_branch, head_branch, commit_message=""):
Expand Down
33 changes: 12 additions & 21 deletions cherry_picker/test_cherry_picker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@ def tmp_git_repo_dir(tmpdir, cd, git_init, git_commit, git_config):
try:
git_init()
except subprocess.CalledProcessError:
version = subprocess.run(("git", "--version"), capture_output=True)
git_version_cmd = "git", "--version"
version = subprocess.run(git_version_cmd, capture_output=True)
Comment on lines +136 to +137
Copy link
Copy Markdown
Member

@ezio-melotti ezio-melotti Apr 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
git_version_cmd = "git", "--version"
version = subprocess.run(git_version_cmd, capture_output=True)
git_version_cmd = ("git", "--version")
version = subprocess.run(git_version_cmd, capture_output=True)

Copy link
Copy Markdown
Member

@hugovk hugovk Apr 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can commit this if you like, and we can watch the formatter remove them again :)

Copy link
Copy Markdown
Member

@zware zware Apr 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds like a broken formatter :). Took me a bit too long to see that git_version_cmd was in fact still a tuple and not just a string (I was apparently just glossing over the ", " as ).

Suggested change
git_version_cmd = "git", "--version"
version = subprocess.run(git_version_cmd, capture_output=True)
git_version_cmd = ["git", "--version"]
version = subprocess.run(git_version_cmd, capture_output=True)

then. Not sure why it's changing in the first place, though...

Copy link
Copy Markdown
Member

@hugovk hugovk Apr 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's actually my memory that is broken 🙃

Here's what was added to Black's 2026 style:

  • remove_parens_from_assignment_lhs: Remove unnecessary parentheses from the left-hand side of assignments while preserving magic trailing commas and intentional multiline formatting

https://github.com/psf/black/blob/main/CHANGES.md#version-2610

So it's safe to add parentheses. PR welcome! There's more than this one instance though, so do them all.

Copy link
Copy Markdown
Member

@zware zware Apr 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, now I see the comment about this being a hack around S607. Honestly, I'd rather just ignore S607 (or use comment suppression), at least in test_*.py.

I'm just complaining with no intent to put time into fixing it in any kind of reasonable time though, so please feel free to ignore me! :)

# the output looks like "git version 2.34.1"
v = version.stdout.decode("utf-8").removeprefix("git version ").split(".")
if (int(v[0]), int(v[1])) < (2, 28):
Expand Down Expand Up @@ -475,14 +476,12 @@ def test_find_config_not_git(tmpdir, cd):

def test_load_full_config(tmp_git_repo_dir, git_add, git_commit):
relative_config_path = ".cherry_picker.toml"
tmp_git_repo_dir.join(relative_config_path).write(
"""\
tmp_git_repo_dir.join(relative_config_path).write("""\
team = "python"
repo = "core-workfolow"
Copy link
Copy Markdown
Member

@ezio-melotti ezio-melotti Apr 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated to this PR, but this seems to be unintentionally misspelled in several tests?

Copy link
Copy Markdown
Member

@hugovk hugovk Apr 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, didn't notice that! Might as well fix it. I'll slip it into this PR.

check_sha = "5f007046b5d4766f971272a0cc99f8461215c1ec"
default_branch = "devel"
"""
)
""")
git_add(relative_config_path)
git_commit("Add config")
scm_revision = get_sha1_from("HEAD")
Expand All @@ -503,11 +502,9 @@ def test_load_full_config(tmp_git_repo_dir, git_add, git_commit):

def test_load_partial_config(tmp_git_repo_dir, git_add, git_commit):
relative_config_path = ".cherry_picker.toml"
tmp_git_repo_dir.join(relative_config_path).write(
"""\
tmp_git_repo_dir.join(relative_config_path).write("""\
repo = "core-workfolow"
"""
)
""")
git_add(relative_config_path)
git_commit("Add config")
scm_revision = get_sha1_from("HEAD")
Expand All @@ -528,14 +525,12 @@ def test_load_partial_config(tmp_git_repo_dir, git_add, git_commit):

def test_load_config_no_head_sha(tmp_git_repo_dir, git_add, git_commit):
relative_config_path = ".cherry_picker.toml"
tmp_git_repo_dir.join(relative_config_path).write(
"""\
tmp_git_repo_dir.join(relative_config_path).write("""\
team = "python"
repo = "core-workfolow"
check_sha = "5f007046b5d4766f971272a0cc99f8461215c1ec"
default_branch = "devel"
"""
)
""")
git_add(relative_config_path)
git_commit(f"Add {relative_config_path}")

Expand Down Expand Up @@ -572,8 +567,7 @@ def test_normalize_long_commit_message():
title == "[3.6] Fix broken `Show Source` links on documentation pages (GH-3113)"
)
assert (
body
== """The `Show Source` was broken because of a change made in sphinx 1.5.1
body == """The `Show Source` was broken because of a change made in sphinx 1.5.1
In Sphinx 1.4.9, the sourcename was "index.txt".
In Sphinx 1.5.1+, it is now "index.rst.txt".
(cherry picked from commit b9ff498793611d1c6a9b99df464812931a1e2d69)
Expand All @@ -596,8 +590,7 @@ def test_normalize_short_commit_message():
title == "[3.6] Fix broken `Show Source` links on documentation pages (GH-3113)"
)
assert (
body
== """(cherry picked from commit b9ff498793611d1c6a9b99df464812931a1e2d69)
body == """(cherry picked from commit b9ff498793611d1c6a9b99df464812931a1e2d69)


Co-authored-by: Elmar Ritsch <35851+elritsch@users.noreply.github.com>"""
Expand Down Expand Up @@ -775,12 +768,10 @@ def test_paused_flow(tmp_git_repo_dir, git_add, git_commit):
initial_scm_revision = get_sha1_from("HEAD")

relative_file_path = "some.toml"
tmp_git_repo_dir.join(relative_file_path).write(
f"""\
tmp_git_repo_dir.join(relative_file_path).write(f"""\
check_sha = "{initial_scm_revision}"
repo = "core-workfolow"
"""
)
""")
git_add(relative_file_path)
git_commit("Add a config")
config_scm_revision = get_sha1_from("HEAD")
Expand Down
14 changes: 5 additions & 9 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,12 @@ optional-dependencies.dev = [
urls.Homepage = "https://github.com/python/cherry-picker"
scripts.cherry_picker = "cherry_picker.cherry_picker:cherry_pick_cli"

[tool.hatch.version]
source = "vcs"
[tool.hatch]
build.hooks.vcs.version-file = "cherry_picker/_version.py"
version.source = "vcs"
# Change regex to match tags like "cherry-picker-v2.2.0".
tag-pattern = '^cherry-picker-(?P<version>[vV]?\d+(?:\.\d+){0,2}[^\+]*)(?:\+.*)?$'

[tool.hatch.build.hooks.vcs]
version-file = "cherry_picker/_version.py"

[tool.hatch.version.raw-options]
local_scheme = "no-local-version"
version.tag-pattern = "^cherry-picker-(?P<version>[vV]?\\d+(?:\\.\\d+){0,2}[^\\+]*)(?:\\+.*)?$"
version.raw-options.local_scheme = "no-local-version"

[tool.ruff]
fix = true
Expand Down
Loading