Merge master into features #2913
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
Also reorganize conftest-related content a bit. Closes pytest-dev#1505, closes pytest-dev#1770.
Strip whitespace from markers in INI config
Introduce a dedicated section about conftest.py
None of the decorators are sufficient to skip an entire file, for example if the file contain invalid code for a given Python version. Simply link to details about customizing the collector. Signed-off-by: Stephen Finucane <[email protected]>
…cstring Adapt the Python 3.7 AST changes
…e-files doc: Include collector config in the skip doc
The "filter_traceback" function was not filtering the frames that belonged to the pytest internals. "filter_traceback" was receiving *relative* paths when running with xdist, and full paths in non-distributed runs; for this reason the traceback function did not consider the received path to be relative to the pytest internal modules. Fix pytest-dev#2843
Append example for pytest.param in the example/parametrize document.
Show full context of doctest source in the pytest output, if the lineno of failed example in the docstring is < 9.
Document pytest.param
Fix context output handling for doctests
…s-2843 Change directory for py27 xdist-related envs
This change slightly modifies the language of the proposal document around use of fixture as parameters of pytest.mark.parametrize. When looking for documentation around this, I very quickly scrolled through this document and landed on the last paragraph thinking it was documenting a real function. This change attempts to make it less likely for this to happen.
Clarify language of proposal for fixtures parameters
List python 3.6 in the documented supported versions
I spent some time today figuring out why PR pytest-dev#2881 was not showing up on doc/parametrize... then after some digging even on readthedocs wondering if the last documentation build had failed, I realized the docs I was looking for was in doc/example/parametrize instead. The section that mentions this is very easy to miss, this makes it a full fledged title and easier to find.
Mention pytest-lazy-fixture plugin in the proposal for parametrize_with_fixtures
…-section Make the "examples" section more prominent in the docs for parametrize
Fix linting errors
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:
$issue_id.$typefor example (588.bug)removal,feature,bugfix,vendor,docortrivialbugfix,vendor,docortrivialfixes, targetmaster; for removals or features targetfeatures;Unless your change is a trivial or a documentation fix (e.g., a typo or reword of a small section) please:
AUTHORS, in alphabetical order;