Merge master into features #6259
Merged
Conversation
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
This makes easier for contributors to get the CHANGELOG entry right the first time.
Improve instructions on how to write CHANGELOG entries
Merge features into master after 5.3
This is necessary for when using e.g. `no_fnmatch_line` after it. Factor it out into `_fail`. (cherry picked from commit aade7ed) Ref: pytest-dev#5914 (comment)
Apparently the version of sphinx that rtd uses is a little more strict about whether an anonymous `code-block` can happen
Fix rendering of Before/After in changelog
pytester: reset log output in _match_lines
This configures the default role for interpreted text (single
backticks), avoiding the need to check for / enforce double backticks.
Fixes also one instance in the existing changelog:
- Detect `pytest_` prefixed hooks using the internal plugin manager since
``pluggy`` is deprecating the ``implprefix`` argument to ``PluginManager``.
(`pytest-dev#3487 <https://github.com/pytest-dev/pytest/issues/3487>`_)
Follow-up to 2228ccb (gone lost in resolving the conflict).
pytester: LineMatcher: __tracebackhide__ with _fail
Added link checking to tox and release.py
Add develop instructions to CONTRIBUTING
…est-dev#6256) Remove sys.last_traceback attribute using del instead of setting to None
docs: configure default_role=literal
CHANGELOG: two minor fixes/improvements
nicoddemus
approved these changes
Nov 21, 2019
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.
No description provided.