Merge master into features #5741
Closed
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 <[email protected]>
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
Codecov Report
@@ Coverage Diff @@
## features #5741 +/- ##
============================================
+ Coverage 96.25% 96.25% +<.01%
============================================
Files 117 117
Lines 25902 25903 +1
Branches 2495 2495
============================================
+ Hits 24932 24933 +1
Misses 666 666
Partials 304 304
Continue to review full report at Codecov.
|
blueyed
reviewed
Aug 14, 2019
Co-Authored-By: Daniel Hahler <[email protected]>
|
Thanks! |
blueyed
reviewed
Aug 14, 2019
| @@ -27,6 +27,8 @@ pytest.skip | |||
|
|
|||
| .. autofunction:: _pytest.outcomes.skip(msg, [allow_module_level=False]) | |||
|
|
|||
| .. _`pytest.importorskip ref`: | |||
There was a problem hiding this comment.
Suggested change
| .. _`pytest.importorskip ref`: | |
| .. _`pytest.importorskip`: |
To fix:
Warning, treated as error:
/home/travis/build/pytest-dev/pytest/doc/en/skipping.rst:182:undefined label: pytest.importorskip (if the link has no caption the label must precede a section header)
That's why I had a "?" with the suggestion.. ;)
|
Hmmm nevermind this branch then, I will re-do the merge once we merge the pending PRs. 👍 |
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.