Fix issues with recent versions of click and django #12
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Django 3.0 removed django.utils.encoding.python_2_unicode_compatible. Use the one from six instead.
Instead of checking for the specific formatting of pytest's wrapper around an exception, check the error message with `ExceptionInfo.match`. This improves compatibility with different versions of pytest.
Improve compatibility with different versions of click (that format args differently cased) by checking against the lower-cased output.
In Django 3.0, the parser is checked for _mutually_exclusive_groups. Add an empty list to ArgumentParserAdapter (since click doesn't support this feature) to make it compatible with Django 3.
…it() Improve compatibility with recent versions of click, that changed how main handles standalone_mode=False works. It now returns the exit_code rather than letting an Exit() propagate.
Check that the exception caught does have ctx before accessing the attribute. It's not likely that that code is ever reached, since ClickException is explicitly caught in main, and not propagated unless standalone_mode=True.
Set prog_name explicitly when calling Command.main. This fixes two issues: * Base command names aren't duplicated in help output * Both base command name and sub-commands are shown, instead of just the sub-command
|
The build error, btw, is an internal coverage error, and should be cleared by clearing the caches. |
simonpercivall
deleted the
fix-issues-with-recent-versions-of-click-and-django
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix multiple issues with recent versions of click and Django:
python_2_unicode_compatible; use the one fromsixinsteadArgumentParser's mutually exclusive groups; add the attribute toArgumentParserAdaptto make Django happyclickdo not exit onctx.exit()ifstandalone_mode = False, instead returning the exit code fromCommand.main(); use that exit code and exit "manually" instead, if it's non-zeroclickcases metavars differently; lowercase some output in tests to make checking equality more compatible with multipleclickversionspyteststringifiesExceptionInfodifferently; match against exception message in tests instead of checking against howpytestformats its wrapperCommandErrorlike Django, with red, bold text