Skip to content

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

Conversation

nicoddemus
Copy link
Member

No description provided.

nicoddemus and others added 30 commits June 3, 2017 20:39
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
…-modules

Fix decode error in Python 2 for doctests in docstrings
…2464

Fix incorrect "collected items" report when specifying tests on the command-line
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
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.
@coveralls
Copy link

Coverage Status

Coverage increased (+0.01%) to 92.153% when pulling 3de9365 on nicoddemus:merge-master-into-features into 1906f8c on pytest-dev:features.

@RonnyPfannschmidt RonnyPfannschmidt merged commit 9b51fc6 into pytest-dev:features Jun 24, 2017
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.

5 participants