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

4.6.4 changelog notes #5521

Merged
merged 1 commit into from
Jun 29, 2019
Merged

4.6.4 changelog notes #5521

merged 1 commit into from
Jun 29, 2019

Conversation

asottile
Copy link
Member

No description provided.

Preparing release version 4.6.4
@@ -203,6 +203,26 @@ Improved Documentation
- `#5416 <https://github.com/pytest-dev/pytest/issues/5416>`_: Fix PytestUnknownMarkWarning in run/skip example.


pytest 4.6.4 (2019-06-28)
Copy link
Member

Choose a reason for hiding this comment

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

Did you move the notes to this position manually? Just curious.

Copy link
Member Author

Choose a reason for hiding this comment

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

yeah the conflict was nasty so I just copied it out of the diff via git show 4.6.4 -- CHANGELOG.rst | grep '^+'

Copy link
Member

Choose a reason for hiding this comment

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

I figured. 😅

@asottile asottile merged commit 4bc0415 into pytest-dev:master Jun 29, 2019
@asottile asottile deleted the cherry-pick-maintenance-release branch June 29, 2019 02:28
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

2 participants