Merge master into features #4808
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
The master and features branches are tested daily.
Travis: add cron_only stage for py38-dev
[Travis are now recommending removing the __sudo__ tag](https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration).
As per: pytest-dev#3974 (comment) Also made the 'match' parameter more prominent
Update kwarg for attr.ib to use 'converter' as 'convert' is due to be deprecated.
collect: python: fix `AssertionError` with broken symlinks
Remove 'message' parameter docs from assert.rst
Travis CI: The 'sudo' tag is now deprecated
Cherry-picked from features. Conflicts: tox.ini
Travis: use xdist for py?? envs, keeping py27/py37
Add good talk by Andrew Svetlov
…_Node_docstring Fix code-block in Node docstring
Travis: remove cron_only stage, use conditional job
Fix python3.8 / pypy failures
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.