Introduce a dedicated section about conftest.py#2864
Merged
nicoddemus merged 1 commit intopytest-dev:masterfrom Oct 24, 2017
Merged
Introduce a dedicated section about conftest.py#2864nicoddemus merged 1 commit intopytest-dev:masterfrom
nicoddemus merged 1 commit intopytest-dev:masterfrom
Conversation
Also reorganize conftest-related content a bit. Closes pytest-dev#1505, closes pytest-dev#1770.
Member
|
Thanks @bilderbuchi!
What do you mean? Can you point out where they conflict with each other? |
nicoddemus
approved these changes
Oct 23, 2017
Member
nicoddemus
left a comment
There was a problem hiding this comment.
Excellent addition, thanks!
Contributor
Author
|
Should have clarified immediately, sorry. One says only/plainly
The other:
It's not a big deal of course, I just noticed the difference. |
Member
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
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.
Also reorganize conftest-related content a bit.
Closes #1505, closes #1770.
Btw, @nicoddemus, your PR template and CONTRIBUTING file are not consistent about if doc changes trigger/warrant an inclusion into the AUTHORS file.