Merge master into features #4253
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
fix pytest-dev#4243 - support positional argument stacklevel on python2
_getconftestmodules: avoid isfile()/dirpath()
The type `bytes` is available on all supported Python versions. On Python 2.7, it is an alias of str, same as six.binary_type. Makes the code slightly more forward compatible.
handle race condition when creation and deletion of a numbered dir overlap
Remove use of unnecessary compat shim, six.binary_type
…e-collect-files add script to generate a example folder for collecting many files
Preparing release version 3.9.3
Codecov Report
@@ Coverage Diff @@
## features #4253 +/- ##
============================================
+ Coverage 95.81% 95.83% +0.02%
============================================
Files 111 111
Lines 24752 24768 +16
Branches 2412 2414 +2
============================================
+ Hits 23716 23737 +21
+ Misses 736 734 -2
+ Partials 300 297 -3
Continue to review full report at Codecov.
|
RonnyPfannschmidt
approved these changes
Oct 28, 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.
Thanks for submitting a PR, your contribution is really appreciated!
Here's a quick checklist that should be present in PRs (you can delete this text from the final description, this is
just a guideline):
changelogfolder, with a name like<ISSUE NUMBER>.<TYPE>.rst. See changelog/README.rst for details.masterbranch for bug fixes, documentation updates and trivial changes.featuresbranch for new features and removals/deprecations.Unless your change is trivial or a small documentation fix (e.g., a typo or reword of a small section) please:
AUTHORSin alphabetical order;