Merge branch 'main' into patch-1

Author: AA-Turner

.pre-commit-config.yaml

@@ -1,12 +1,12 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.6
+    rev: v0.12.2
     hooks:
       - id: ruff
         args: [--exit-non-zero-on-fix]
 
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 24.10.0
+    rev: 25.1.0
     hooks:
       - id: black
 
@@ -25,18 +25,18 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.30.0
+    rev: 0.33.2
     hooks:
       - id: check-dependabot
       - id: check-github-workflows
 
   - repo: https://github.com/rhysd/actionlint
-    rev: v1.7.6
+    rev: v1.7.7
     hooks:
       - id: actionlint
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.14.1
+    rev: v1.16.1
     hooks:
       - id: mypy
         args:
@@ -50,22 +50,22 @@ repos:
         additional_dependencies: ["types-requests"]
 
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: v2.5.0
+    rev: v2.6.0
     hooks:
       - id: pyproject-fmt
 
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.23
+    rev: v0.24.1
     hooks:
       - id: validate-pyproject
 
   - repo: https://github.com/tox-dev/tox-ini-fmt
-    rev: 1.4.1
+    rev: 1.5.0
     hooks:
       - id: tox-ini-fmt
 
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.3.0
+    rev: v2.4.1
     hooks:
       - id: codespell
         args: [--ignore-words-list=commitish]

cherry_picker/cherry_picker.py

@@ -418,7 +418,7 @@ def amend_commit_message(self, cherry_pick_branch):
     def pause_after_committing(self, cherry_pick_branch):
         click.echo(
             f"""
-Finished cherry-pick {self.commit_sha1} into {cherry_pick_branch} \U0001F600
+Finished cherry-pick {self.commit_sha1} into {cherry_pick_branch} \U0001f600
 --no-push option used.
 ... Stopping here.
 To continue and push the changes:
@@ -659,7 +659,7 @@ def continue_cherry_pick(self):
             ]
             self.commit_sha1 = get_full_sha_from_short(short_sha)
 
-            commits = get_commits_from_backport_branch(base)
+            commits = get_commits_from_backport_branch(f"{self.upstream}/{base}")
             if len(commits) == 1:
                 commit_message = self.amend_commit_message(cherry_pick_branch)
             else:
@@ -697,7 +697,7 @@ def continue_cherry_pick(self):
         else:
             click.echo(
                 f"Current branch ({cherry_pick_branch}) is not a backport branch. "
-                "Will not continue. \U0001F61B"
+                "Will not continue. \U0001f61b"
             )
             set_state(WORKFLOW_STATES.CONTINUATION_FAILED)
 
@@ -843,12 +843,12 @@ def cherry_pick_cli(
 ):
     """cherry-pick COMMIT_SHA1 into target BRANCHES."""
 
-    click.echo("\U0001F40D \U0001F352 \u26CF")
+    click.echo("\U0001f40d \U0001f352 \u26cf")
 
     try:
         chosen_config_path, config = load_config(config_path)
     except ValueError as exc:
-        click.echo("You're not inside a Git tree right now! \U0001F645", err=True)
+        click.echo("You're not inside a Git tree right now! \U0001f645", err=True)
         click.echo(exc, err=True)
         sys.exit(-1)
     try:

pyproject.toml

@@ -2,19 +2,20 @@
 build-backend = "hatchling.build"
 requires = [
   "hatch-vcs",
-  "hatchling",
+  "hatchling>=1.27",
 ]
 
 [project]
 name = "cherry-picker"
 description = "Backport CPython changes from main to maintenance branches"
 readme = "README.md"
+license = "Apache-2.0"
+license-files = [ "LICENSE" ]
 maintainers = [ { name = "Python Core Developers", email = "core-workflow@python.org" } ]
 authors = [ { name = "Mariatta Wijaya", email = "mariatta@python.org" } ]
 requires-python = ">=3.9"
 classifiers = [
   "Intended Audience :: Developers",
-  "License :: OSI Approved :: Apache Software License",
   "Programming Language :: Python :: 3 :: Only",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",