Skip to content

Merge master into features #4749

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
merged 43 commits into from
Feb 8, 2019

Conversation

blueyed
Copy link
Contributor

@blueyed blueyed commented Feb 8, 2019

No description provided.

arel and others added 30 commits January 27, 2019 16:40
….2.0-changelog

Update changelog to reflect spelling change of xfail
…tance-4700

Fix setUpClass being called in subclasses that were skipped
…-raises-document-only

Document parametrizing conditional raises
Remove workaround for docstrings for py38+
Do not raise UsageError when "pytest_plugins" is a module
Call pytest_report_collectionfinish hook when --collect-only is passed
Document how to customize test failure message for missing warnings
RonnyPfannschmidt and others added 9 commits February 7, 2019 07:07
…name

Mention that `pytest_plugins` should not be used as module name
Change the indentation in _setup_cli_logging by moving the
self._log_cli_enabled check outside of the _setup_cli_logging method.
Fix `parametrize(... ids=<function>)` when the function returns non-strings
`_collectfile` should be called on files only.

Fixes pytest-dev#4592.
Fix handling of collect_ignore from parent conftest
@blueyed
Copy link
Contributor Author

blueyed commented Feb 8, 2019

Will cancel CI, should be done after/with #4751.

@blueyed blueyed merged commit a131cd6 into pytest-dev:features Feb 8, 2019
@blueyed blueyed deleted the merge-master-into-features branch February 8, 2019 21:06
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.