-
-
Notifications
You must be signed in to change notification settings - Fork 2.8k
merge master into features #2222
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
RonnyPfannschmidt
merged 49 commits into
pytest-dev:features
from
RonnyPfannschmidt:features
Jan 26, 2017
Merged
merge master into features #2222
RonnyPfannschmidt
merged 49 commits into
pytest-dev:features
from
RonnyPfannschmidt:features
Jan 26, 2017
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
Fix broken links
Switch monkeypatch fixture to yield syntax
Test py36 on AppVeyor
Otherwise it is not included by default as wheels do not honor the MANIFEST.in Signed-off-by: Philippe Ombredanne <[email protected]>
Ensure the LICENSE is included in built wheels
Currently if the terminal report of testdir.runpytest() is missing, assert_outcomes() on its output fails because parseoutcomes() returns an unexpected value (None). It's better to fail parseoutcomes() directly.
…-rewrite Consider plugins loaded by PYTEST_PLUGINS for assertion rewrite
…docs Remove mention of --assert=reinterp in documentation
I cheated a little and updated the example output by hand. 😁 Fix pytest-dev#2200
Fix marker example on "linux" platform
…f zope.interface Fix pytest-dev#1989
…failure Fail assert_outcomes() on missing terminal report
Assert statements of the pytester plugin again benefit from assertion rewriting fixes pytest-dev#1920
todo: reenable in the features branch
Fix pytester internal plugin to work correctly with latest versions of zope.interface
fix pytest-dev#2118 - rework Node._getcustomclass and Node compat properties
due to a devpi bug, we always get a sdist install which in turn triggers the pytest issue pytest-dev#2042 / pytest-dev#726 going for pyargs and a changed folder, it should no longer happen (and will be tested firther after rebasing the release branch)
…ing/devpi-bug fix devpi test for doctesting env
and order AUTHORS
Add py36 classifier & Add py37 to travis
Discourage users from using unittest support somewhat
nicoddemus
reviewed
Jan 26, 2017
return getattr(pytest, name) | ||
else: | ||
cls = getattr(self, name) | ||
# TODO: reenable in the features branch |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a reminder of this, but I suggest doing it in a separate PR
nicoddemus
approved these changes
Jan 26, 2017
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, nicely done
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.
.