Merge master into features#4228
Merged
blueyed merged 32 commits intopytest-dev:featuresfrom Oct 24, 2018
Merged
Conversation
Fix filename reported by `warnings.warn` when using `recwarn` under python2.
Those were removed by accident in a previous commits it seems
…rror-msg-4026 Improve error message when it is not possible to determine a function's signature
Upgrade pre-commit/pre-commit-hooks to 2.0.0
Use safe_str() to format warning message about unicode in Python 2
Update tmpdir.rst - very trivial
fix typo in tmpdir documentation (trivial)
Fix logging usage in hooks pytest_sessionstart/finish
…ures Improve error message when a recursive dependency between fixtures is detected
Remove pytest.config example from skipping at module level docs
Release version 3.9.2
Fixes for flake8 master
Fix "Plugin already registered" error with symlinks
…eterset Add `empty_parameter_set_mark` ini option documentation to the parametrize doc
This has been failing as of 2018-10-23 while installing gcc with this message: ==> Installing numpy dependency: gcc ==> Downloading https://homebrew.bintray.com/bottles/gcc-8.2.0.high_sierra.bottl ######################################################################## 100.0% ==> Pouring gcc-8.2.0.high_sierra.bottle.1.tar.gz Error: The `brew link` step did not complete successfully The formula built, but is not symlinked into /usr/local Could not symlink include/c++ Target /usr/local/include/c++ already exists. You may want to remove it: rm '/usr/local/include/c++' To force the link and overwrite all conflicting files: brew link --overwrite gcc To list all files that would be deleted: brew link --overwrite --dry-run gcc Possible conflicting files are: /usr/local/include/c++ -> /usr/local/Caskroom/oclint/0.13.1,17.4.0/oclint-0.13.1/include/c++
nicoddemus
approved these changes
Oct 24, 2018
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
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.