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

Add changelog/README.rst and streamline our PR template text #3192

Merged
merged 2 commits into from
Feb 8, 2018

Conversation

nicoddemus
Copy link
Member

This streamlines the PR template text and adds a more in-depth explanation
about how the changelog entries work because this topic is a common source of
confusion:

  • How to name the files.
  • Which formatting to use (people in general assume it is Markdown).
  • Recommend adding .rst extension to changelog files to help with the
    above (towncrier doesn't care).

This was heavily inspired by the excellent python-trio/trio docs, I hope @njsmith doesn't mind. 😁

This streamlines the PR template text and adds a more in-depth explanation
about how the changelog entries work because this topic is a common source of
confusion:

- How to name the files.
- Which formatting to use (people in general assume it is Markdown).
- Recommend adding `.rst` extension to changelog files to help with the
  above (`towncrier` doesn't care).

This was heavily inspired by the excellent python-trio/trio docs.
@coveralls
Copy link

coveralls commented Feb 7, 2018

Coverage Status

Coverage increased (+0.005%) to 92.632% when pulling eea169e on nicoddemus:pr-template into 7152707 on pytest-dev:master.

@njsmith
Copy link

njsmith commented Feb 7, 2018

Glad to help 👍

* Make sure to use full sentences with correct case and punctuation, for example: "Fix issue with non-ascii contents in doctest text files."
- [ ] Target: for `bugfix`, `vendor`, `doc` or `trivial` fixes, target `master`; for removals or features target `features`;
- [ ] Make sure to include reasonable tests for your change if necessary
- [ ] Create a new changelog file into the `changelog` folder, with a name like `<ISSUE NUMBER>.<TYPE>.rst`. See [changelog/README.rst](/changelog/README.rst) for details.
Copy link
Member

Choose a reason for hiding this comment

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

into -> in

Copy link
Member Author

Choose a reason for hiding this comment

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

Done thanks!

* ``feature``: new user facing features, like new command-line options and new behavior.
* ``bugfix``: fixes a reported bug.
* ``doc``: documentation improvement, like rewording an entire session or adding missing docs.
* ``removal``: feature deprecation or removal;
Copy link
Member

Choose a reason for hiding this comment

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

It looks like you switched from . to ; here?

Copy link
Member Author

Choose a reason for hiding this comment

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

Done, thanks!

* ``bugfix``: fixes a reported bug.
* ``doc``: documentation improvement, like rewording an entire session or adding missing docs.
* ``removal``: feature deprecation or removal;
* ``vendor``: vendoring news;
Copy link
Member

Choose a reason for hiding this comment

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

Might want to be a bit verbose here and give some context on what vendoring means - something like "Changes in packages vendored in pytest." or so? On the other hand, didn't we get rid of vendoring anyways?

Copy link
Member Author

Choose a reason for hiding this comment

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

Good point, updated.

We are not vendoring anything more at the moment, but we might do it again in the future. I guess we can always remove this later if we officially abolish the practice.

@nicoddemus
Copy link
Member Author

Applied all your suggestions @The-Compiler, thanks!

@The-Compiler
Copy link
Member

LGTM now, thanks!

@The-Compiler
Copy link
Member

Huh, tried to merge this from my phone but I get a 404 - feel free to merge it!

@The-Compiler
Copy link
Member

Back on my laptop, let's merge! 🎉

@The-Compiler The-Compiler merged commit 3685c1b into pytest-dev:master Feb 8, 2018
@nicoddemus nicoddemus deleted the pr-template branch February 8, 2018 18:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants