Merge master into features #3831
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
Only consider actual functions when collecting hooks
Add a changelog blurb and title, similar to tox
…ecursion-bug Fix infinite recursion collection bug with pytest_ignore_collect hook
…aseFunction._testcase as attribute of class with a None default.
…exception Pr 3788 fix teardown exception
Fix issue where fixtures would lose the decorated functionality
Encountered the warning myself and to me the message was not clear about what should be done to fix the warning
…ig-doc Unhide documentation for metafunc.config
…doption Improve warning messages when addoption is called with string as `type`
Add CHANGELOG for issue pytest-dev#3774, missing from PR pytest-dev#3780
tox: clean up docs target
Fix pytest-dev#3671 - `filterwarnings` Is an Unregistered Marker
Fix test collection from packages mixed with directories. pytest-dev#3768 and pytest-dev#3789
Fix traceback reporting for exceptions with `__cause__` cycles.
…t manager as well.
Preparing release version 3.7.2
Also change the context-manager to global_and_fixture_disabled to better convey its meaning
…fo-type-hints Replace broken type annotations with type comments
…li-logging Bugfix/capsys with cli logging
RonnyPfannschmidt
approved these changes
Aug 18, 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.