Skip to content
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

Introduce a dedicated section about conftest.py #2864

Merged
merged 1 commit into from
Oct 24, 2017

Conversation

bilderbuchi
Copy link
Contributor

@bilderbuchi bilderbuchi commented Oct 23, 2017

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.

Also reorganize conftest-related content a bit.
Closes pytest-dev#1505, closes pytest-dev#1770.
@nicoddemus
Copy link
Member

Thanks @bilderbuchi!

your PR template and CONTRIBUTING file are not consistent about if doc changes trigger/warrant an inclusion into the AUTHORS file.

What do you mean? Can you point out where they conflict with each other?

Copy link
Member

@nicoddemus nicoddemus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excellent addition, thanks!

@bilderbuchi
Copy link
Contributor Author

bilderbuchi commented Oct 23, 2017

Should have clarified immediately, sorry. One says only/plainly

Add yourself to AUTHORS file if not there yet, in alphabetical order.

The other:

Unless your change is a trivial or a documentation fix (e.g., a typo or reword of a small section) please:
Add yourself to AUTHORS;

It's not a big deal of course, I just noticed the difference.

@nicoddemus
Copy link
Member

We can ignore the linting failure, it will be fixed in #2862 by a3ec3df.

@coveralls
Copy link

Coverage Status

Coverage remained the same at 92.235% when pulling e23af00 on bilderbuchi:fix-1505 into 531e0dc on pytest-dev:master.

@nicoddemus nicoddemus merged commit 0b540f9 into pytest-dev:master Oct 24, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants