[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

cherry_picker/cherry_picker.py

@@ -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.
@@ -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=""):

cherry_picker/test_cherry_picker.py

@@ -475,14 +475,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"
     check_sha = "5f007046b5d4766f971272a0cc99f8461215c1ec"
     default_branch = "devel"
-    """
-    )
+    """)
     git_add(relative_config_path)
     git_commit("Add config")
     scm_revision = get_sha1_from("HEAD")
@@ -503,11 +501,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")
@@ -528,14 +524,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}")
 
@@ -572,8 +566,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)
@@ -596,8 +589,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>"""
@@ -775,12 +767,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")

pyproject.toml

@@ -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