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

Merge master into features #4068

Merged

Conversation

nicoddemus
Copy link
Member

No description provided.

iwanb and others added 30 commits September 23, 2018 13:05
Fix pytest-dev#3539: reload module with assertion rewrite import hook
…eprecation-docs

Add an example on how to update config.warn calls
add documentation of register_assert_rewrite
…cated

Our policy is to not deprecate features during bugfix releases, but in this
case I believe it makes sense as we are only documenting it as deprecated,
without issuing warnings which might potentially break test suites.

This will get the word out that hook implementers should not use this parameter
at all.

Fix pytest-dev#4036
…nings-captured-hook

Document that item parameter of pytest_warning_captured hook is deprecated
…ing-workaround-4039

Do not issue non-top-level conftest warning when --pyargs is used
…r-messaging

Improve error messaging when invalid syntax is passed to the -m option
…hon 2

Fixes the bug described in:

	tox-dev/tox#1025 (comment)

Which is more evident when using `unicode_literals`.
@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) to 93.833% when pulling 1101a20 on nicoddemus:merge-master-into-features into 5d8467b on pytest-dev:features.

@RonnyPfannschmidt RonnyPfannschmidt merged commit 29d3fae into pytest-dev:features Oct 3, 2018
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.