Merge master into features #4645
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
…guration-files Documentation configuration files
…onpath Mention PYTHONPATH semantics in goodpractices.rst
…ittest Change test_warningschecker_twice to a unittest
Show full repr with assert a==b and -vv
…tmod-has-call Doctest: hack in handling mock style objects
Pytest rewrites assertions so that the items on each side of a comoparison will have easier-to-read names in case of an assertion error. Before doing this, it checks to make sure the object doesn't have a __name__ attribute; however, it uses `hasattr` so if the objects __getattr__ is broken then the test failure message will be the stack trace for this failure instead of a rewritten assertion.
When rewriting assertions, pytest makes a call to `__name__` on each object in a comparision. If one of the objects has reimplemented `__getattr__`, they could fail trying to fetch `__name__` with an error other than `AttributeError`, which is what `hasattr` catches. In this case, the stack trace for the failed `__getattr__` call will show up in the pytest output, even though it isn't related to the test failing. This change fixes that by catching exceptions that `hasattr` throws.
…with-failing-getattr Assertion rewrite breaks for objects that reimplement `__getattr__`
Use sphinx removed in extension in the documentation
Preparing release version 4.1.1
Part of the configuration necessary for https://github.com/apps/rtd-helper
Add rtd-bot configuration file
np.asscalar() has been deprecated in numpy 1.16: https://github.com/numpy/numpy/blob/master/doc/release/1.16.0-notes.rst#new-deprecations
Use a.item() instead of deprecated np.asscalar(a)
nicoddemus
approved these changes
Jan 14, 2019
Codecov Report
@@ Coverage Diff @@
## features #4645 +/- ##
============================================
+ Coverage 93.97% 95.72% +1.74%
============================================
Files 111 111
Lines 24603 24686 +83
Branches 2437 2448 +11
============================================
+ Hits 23120 23630 +510
+ Misses 1161 744 -417
+ Partials 322 312 -10
Continue to review full report at Codecov.
|
asottile
approved these changes
Jan 14, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.