Merge master into features #5744
Merged
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
Improve docs of pytest.importorskip
Co-Authored-By: Bruno Oliveira <nicoddemus@gmail.com>
Update URL: python/black → psf/black
Likely to fix flaky coverage due to requests failing sometimes. Ref: https://codecov.io/gh/pytest-dev/pytest/compare/f7e81dab9aa8d57498511e1b5655b53cbfbed0d0...83a1f4bd668fe337d42f909cc2ef2d8d986e9748/changes
remove %s formatting from docs
test_non_ascii_paste_text: mock call to urlopen
Co-Authored-By: Bruno Oliveira <nicoddemus@gmail.com>
Do not treat warnings as errors during ``pytest_configure``.
warn for async generator functions
…-dev#5701) check that tests that are partial staticmethods are supported
Async result warn
Conflicts: src/_pytest/outcomes.py
Codecov Report
@@ Coverage Diff @@
## features #5744 +/- ##
============================================
+ Coverage 96.25% 96.25% +<.01%
============================================
Files 117 117
Lines 25902 25948 +46
Branches 2495 2497 +2
============================================
+ Hits 24932 24977 +45
- Misses 666 667 +1
Partials 304 304
Continue to review full report at Codecov.
|
blueyed
reviewed
Aug 15, 2019
| @@ -251,7 +257,7 @@ def get_real_method(obj, holder): | |||
| try: | |||
| is_method = hasattr(obj, "__func__") | |||
| obj = get_real_func(obj) | |||
| except Exception: | |||
| except Exception: # pragma: no cover | |||
There was a problem hiding this comment.
wut?
Rather leave it show up in reports..
|
Thanks! Please rebase #5747 on |
|
You can/should release regardless of #5747, no? (which is not going to merged right away) |
|
Yep, only later I saw it closely and noticed it did not affect the release in the end. 👍 |
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.
No description provided.