From 487167107b73ea39d544ed9075674eb6ffdc7c73 Mon Sep 17 00:00:00 2001 From: Jakub Kuczys Date: Wed, 16 Oct 2024 04:33:25 +0200 Subject: [PATCH] version_sort_key -> compute_version_sort_key --- cherry_picker/cherry_picker.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cherry_picker/cherry_picker.py b/cherry_picker/cherry_picker.py index af0a558..80921a7 100755 --- a/cherry_picker/cherry_picker.py +++ b/cherry_picker/cherry_picker.py @@ -194,7 +194,7 @@ def upstream(self): def sorted_branches(self): """Return the branches to cherry-pick to, sorted by version.""" return sorted( - self.branches, key=functools.partial(version_sort_key, self.config) + self.branches, key=functools.partial(compute_version_sort_key, self.config) ) @property @@ -829,7 +829,7 @@ def get_base_branch(cherry_pick_branch, *, config): # Subject the parsed base_branch to the same tests as when we generated it # This throws a ValueError if the base_branch doesn't meet our requirements - version_sort_key(config, base_branch) + compute_version_sort_key(config, base_branch) return base_branch @@ -849,7 +849,7 @@ def validate_sha(sha): ) -def version_sort_key(config, branch): +def compute_version_sort_key(config, branch): """ Get sort key based on version information from the given git branch name.