Skip to content

Conversation

@asottile
Copy link
Member

No description provided.

Preparing release version 4.6.4
- `#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.

2 participants