Merge master into features (make CI green again) #5281
Merged
Conversation
This file contains hidden or 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
The code-block directives are required by our blacken-docs hook
Documentation: add setenv/delenv examples to monkeypatch docs
Remove 'b' from sys.stdout.mode
Add an introductory section about how to register marks, including doing so programatically (pytest-dev#5255).
This has been in place for a long time now, since 3.6.
Co-Authored-By: Daniel Hahler <[email protected]>
Improve mark docs
This is no longer needed it seems
Fixed double `be` word on monkeypatch docs page.
pytest-dev#5276) Make it clear that small typos in docs don't require a CHANGELOG entry
Disable PyPy on Azure
…thon No tests for this because we don't test with Jython currently. Fix pytest-dev#5256
…hon-5256 Handle lone surrogate unicode character not being representable in Jython
Codecov Report
@@ Coverage Diff @@
## features #5281 +/- ##
============================================
+ Coverage 92.07% 92.12% +0.05%
============================================
Files 115 115
Lines 26159 26165 +6
Branches 2578 2578
============================================
+ Hits 24086 24105 +19
+ Misses 1746 1731 -15
- Partials 327 329 +2
Continue to review full report at Codecov.
|
blueyed
approved these changes
May 17, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.