Merge master into features #4190
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
xdist has an workaround inplace for Travis so "-n auto" works. Fix pytest-dev#4162
Pass TRAVIS env var to test environments [skip appveyor]
Using string formatting with the raw escaped object lead to string evaluation "<py._xmlgen.raw object>" Format the unescaped string first, then use the XML escape method as a last step.
…skipped Fix pytest-dev#3533: properly escape raw XML object
…o-master Merge features into master
Some points on the document work different in 3.9, plus changed the order of the sections a bit to make more sense for users reading it for the first time.
Update warnings docs
As mentioned in pytest-dev#4128 (comment)
…ook-name Fix hook name in deprecations.rst
fix test_cleanup_keep for expecting symlinks
We have since moved to codecov and uploading to coveralls is breaking OS-X builds for py37 [1], so we might as well take this opportunity to drop it. [1] https://travis-ci.org/pytest-dev/pytest/jobs/442858038
No longer upload code coverage to coveralls
…ools fix pytest-dev#4177 - pin setuptools>=40.0
Member
Author
|
OK Travis and Appveyor be crazy, triggering double jobs and stuff... |
Member
Author
|
Of course the build failure above can be ignored (it was actually cancelled by AppVeyor itself for some reason). 👍 |
asottile
approved these changes
Oct 18, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
So we can get green builds again because of #4186