From 33b1de7b7d758de16771e1f5e6ce8e52a5b824ed Mon Sep 17 00:00:00 2001 From: Andrew Svetlov Date: Sun, 13 Jan 2019 15:48:30 +0200 Subject: [PATCH 1/2] Relax click dependency. Allow to install cherry_picker with the modern click version --- cherry_picker/cherry_picker/cherry_picker.py | 2 +- cherry_picker/pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cherry_picker/cherry_picker/cherry_picker.py b/cherry_picker/cherry_picker/cherry_picker.py index 1a689c4..eab9972 100755 --- a/cherry_picker/cherry_picker/cherry_picker.py +++ b/cherry_picker/cherry_picker/cherry_picker.py @@ -383,7 +383,7 @@ def check_repo(self): default=None) @click.argument('commit_sha1', 'The commit sha1 to be cherry-picked', nargs=1, default = "") -@click.argument('branches', 'The branches to backport to', nargs=-1) +@click.argument('branches', help='The branches to backport to', nargs=-1) def cherry_pick_cli(dry_run, pr_remote, abort, status, push, config_path, commit_sha1, branches): diff --git a/cherry_picker/pyproject.toml b/cherry_picker/pyproject.toml index cde534f..c58dee3 100644 --- a/cherry_picker/pyproject.toml +++ b/cherry_picker/pyproject.toml @@ -9,7 +9,7 @@ author-email = "mariatta.wijaya@gmail.com" maintainer = "Python Core Developers" maintainer-email = "core-workflow@python.org" home-page = "https://github.com/python/core-workflow/tree/master/cherry_picker" -requires = ["click~=6.7", "gidgethub", "requests", "toml"] +requires = ["click>=6.0", "gidgethub", "requests", "toml"] dev-requires = ["pytest~=3.0.7"] description-file = "readme.rst" classifiers = ["Programming Language :: Python :: 3.6", "Intended Audience :: Developers", "License :: OSI Approved :: Apache Software License"] From 4b55cadb5527bc62503eb5c9e2f5cfa87e7bb25b Mon Sep 17 00:00:00 2001 From: Andrew Svetlov Date: Sun, 13 Jan 2019 16:05:52 +0200 Subject: [PATCH 2/2] Fix args spec --- cherry_picker/cherry_picker/cherry_picker.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cherry_picker/cherry_picker/cherry_picker.py b/cherry_picker/cherry_picker/cherry_picker.py index eab9972..223ed22 100755 --- a/cherry_picker/cherry_picker/cherry_picker.py +++ b/cherry_picker/cherry_picker/cherry_picker.py @@ -381,11 +381,11 @@ def check_repo(self): help=("Path to config file, .cherry_picker.toml " "from project root by default"), default=None) -@click.argument('commit_sha1', 'The commit sha1 to be cherry-picked', nargs=1, - default = "") -@click.argument('branches', help='The branches to backport to', nargs=-1) +@click.argument('commit_sha1', nargs=1, default="") +@click.argument('branches', nargs=-1) def cherry_pick_cli(dry_run, pr_remote, abort, status, push, config_path, commit_sha1, branches): + """cherry-pick COMMIT_SHA1 into target BRANCHES.""" click.echo("\U0001F40D \U0001F352 \u26CF")