Merge master into features #4338
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
Closes pytest-dev#4300. [ci skip]
doc: add lost changelog entry
…ytes replace byte/unicode helpers in test_capture with python level syntax
Update pypi.python.org reference to pypi.org
Use unicode/bytes literals instead of calls
Add missing `-` in front of the new option `--sw`
…h_loose_version Don't string-compare version numbers
…nit_tests Fix handling of duplicate args with regard to Python packages
Conflicts: src/_pytest/main.py
Codecov Report
@@ Coverage Diff @@
## features #4338 +/- ##
============================================
- Coverage 95.84% 95.84% -0.01%
============================================
Files 111 111
Lines 24895 24893 -2
Branches 2427 2431 +4
============================================
- Hits 23861 23858 -3
Misses 737 737
- Partials 297 298 +1
Continue to review full report at Codecov.
|
RonnyPfannschmidt
approved these changes
Nov 8, 2018
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.