-
-
Notifications
You must be signed in to change notification settings - Fork 2.8k
Merge master into features #2526
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
Merged
RonnyPfannschmidt
merged 34 commits into
pytest-dev:features
from
nicoddemus:merge-master-into-features
Jun 24, 2017
Merged
Merge master into features #2526
RonnyPfannschmidt
merged 34 commits into
pytest-dev:features
from
nicoddemus:merge-master-into-features
Jun 24, 2017
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 unfortunately no longer supports multiple entries with the same text, but this is worth the improved readability and navigation IMO
Docs: clarify when hooks stop after the first non-None result
Update copyright dates in LICENSE, README.rst and in the documentation
…le_subrequest_finalizer_exceptions Handle exceptions in subrequest finalizers
This was made obsolete by 021e843
…-modules Fix decode error in Python 2 for doctests in docstrings
…2464 Fix incorrect "collected items" report when specifying tests on the command-line
Add issue links in the CHANGELOG entries
Because setuptools_scm already includes all version-controlled files in an sdist, we don't need to maintain a MANIFEST.in file and anymore See pytest-dev/pytest-xdist#161
Remove MANIFEST.in and related lint check
fixture docs: highlight difference between yield and addfinalizer methods
Fix internal error when trying to detect the start of a recursive traceback
…ted-call-ctx deprecated_call context manager captures warnings already raised
I think it might sense to display in the CHANGELOG internal or trivial changes because they might trip users between releases. For example, a note about an internal refactoring (like moving a class between modules) is useful for a user that has been using the internal API. Of course we are not breaking anything because it was an internal API, but no reason not to save time for users who did use it.
…elog Show "trivial" category in CHANGELOG
…asks Vendoring tasks
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.