Skip to content
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

Jump to bottom

Relax click dependency. #302

Merged
merged 2 commits into from
Jan 13, 2019
Merged

Relax click dependency. #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33b1de7
Relax click dependency.
asvetlov Jan 13, 2019
4b55cad
Fix args spec
asvetlov Jan 13, 2019
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
6 changes: 3 additions & 3 deletions cherry_picker/cherry_picker/cherry_picker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Copy link
Contributor

Choose a reason for hiding this comment

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

Why remove the explanation? How is this related to the click dependency update?

Copy link
Contributor

Choose a reason for hiding this comment

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

oh, they changed api..

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Explicitly forbade meaningless argument actually. The help was never displayed IIRC

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh, nevermind. I've already figured out that it fails with this arg under newer Click: https://travis-ci.org/python/core-workflow/jobs/491106736#L270

default = "")
@click.argument('branches', '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")

Expand Down
2 changes: 1 addition & 1 deletion cherry_picker/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down