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.

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

Merge features into master (was intended to: Merge master into features) #5874

Merged
merged 22 commits into from
Sep 23, 2019

Conversation

nicoddemus
Copy link
Member

No description provided.

bluetech and others added 22 commits August 16, 2019 10:41
This is nice for self-documentation, and is the type required by mypy
for adding to sys.meta_path.
`argparse.HelpFormatter` looks at `$COLUMNS` only, falling back to a
default of 80.

`py.io.get_terminal_width()` is smarter there, and could even work
better with pytest-dev/py#219.

This ensures to use a consistent value for formatting the ini values etc.
Inject width via pylib to argparse formatter
1/X Fix check_untyped_defs = True mypy errors
We find that the --pastebin option to pytest sometimes fails with "HTTP
Error 400: Bad Request". We're still investigating the exact cause of
these errors, but in the meantime, a failure to upload to the pastebin
service should probably not crash pytest and cause a test failure in the
continuous-integration.

This patch catches exceptions like HTTPError that may be thrown while
trying to communicate with the pastebin service, and reports them as a
"bad response", without crashing with a backtrace or failing the entire
test suite.
Gracefully handle HTTP errors from pastebin
Fix "lexer" being used when uploading to bpaste.net
Conflicts:
	src/_pytest/reports.py
        (via 7259c45, moved the type annotation; setting it to `None`
        was removed in 3c82b1c already)
@nicoddemus nicoddemus merged commit c28b631 into pytest-dev:master Sep 23, 2019
@nicoddemus nicoddemus deleted the mm branch September 23, 2019 15:44
@blueyed
Copy link
Contributor

blueyed commented Sep 23, 2019

This was merged into master..?!

nicoddemus added a commit to nicoddemus/pytest that referenced this pull request Sep 23, 2019
This reverts commit c28b631, reversing
changes made to 7c64d5d.
@nicoddemus
Copy link
Member Author

Ouch my bad, really sorry. #5877 reverts this.

@blueyed blueyed changed the title Merge master into features Merge features into master (was intended to: Merge master into features) Sep 23, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants