Merge master into features#2096
Merged
RonnyPfannschmidt merged 30 commits intopytest-dev:featuresfrom Nov 27, 2016
Merged
Conversation
Don't fail if imp can't find the source for a .pyc file. pytest-dev#2038
Show an error if --confcutdir is not a valid directory
Fix error in approx's repr with complex numbers
Just noticed that the "coveralls" env was being execute after each env. This was introduced by mistake in pytest-dev#2056
…eyor Only execute "coveralls" toxenv once on AppVeyor
Related to pypa/setuptools#861 Remove the pin when we have a new setuptools release
Pin setuptools to < 29 because of AppVeyor failures
Add hint of Issue pytest-dev#478 to error text
Clarify test discovery docs.
This new test proves that reports do not capture stdout by default when skipped.
Add `:ref:` targets to `recwarn.rst`.
Add documentation building note.
Add test case for pytest-dev#595.
Remove setuptools pin now that upstream has been fixed
"inc" reads better, also fixed the line separators so they have the same size
Use "inc" instead of "func" in the snipped on README
RonnyPfannschmidt
approved these changes
Nov 27, 2016
Member
|
appveyor passed up until 3.5 going to merge |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 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.