Ronny Pfannschmidt
ca0476953e
Merge pull request #3751 from nicoddemus/collect-file-bug
...
Workaround for #3742
2018-08-02 07:35:46 +02:00
Ronny Pfannschmidt
7e92930fa9
Merge pull request #3764 from asottile/fix_3763
...
Fix `TypeError` when the assertion message is `bytes` in python 3.
2018-08-02 07:19:51 +02:00
Ronny Pfannschmidt
33769d0328
Merge pull request #3754 from nicoddemus/fix-function-call-warning
...
Refactor direct fixture call warning to avoid incompatibility with plugins
2018-08-02 07:17:15 +02:00
Bruno Oliveira
5db2e6c7a1
Merge pull request #3761 from nicoddemus/numpy-recursion-error
...
Fix recursion in pytest.approx() with arrays in numpy<1.13
2018-08-01 23:40:30 -03:00
Bruno Oliveira
804fc4063a
Merge pull request #3741 from kalekundert/approx_misc_tweaks
...
Miscellaneous improvements to approx()
2018-08-01 23:40:21 -03:00
Anthony Sottile
452e5c1cf0
Fix `TypeError` when the assertion message is `bytes` in python 3.
2018-08-01 15:09:25 -07:00
Bruno Oliveira
c6b11b9f62
Refactor direct fixture call warning to avoid incompatibility with plugins
...
This refactors the code so we have the real function object right during
collection. This avoids having to unwrap it later and lose attached information
such as "async" functions.
Fix #3747
2018-08-01 16:38:43 -03:00
Kale Kundert
b8255308d6
Make the infinite-recusrion fix more explicit.
...
So we remember what happened and don't accidentally regress in the
future.
2018-08-01 12:11:03 -07:00
Bruno Oliveira
a5c0fb7f6b
Rename recursive_map -> _recursive_list_map as requested in review
2018-08-01 15:17:58 -03:00
Bruno Oliveira
7d13599ba1
Fix recursion in pytest.approx() with arrays in numpy<1.13
2018-08-01 08:04:09 -03:00
Bruno Oliveira
2a2f888909
Move recursive_map from local to free function
2018-08-01 07:30:40 -03:00
Bruno Oliveira
ad5ddaf55a
Simplify is_numpy_array as suggested in review
2018-08-01 07:28:39 -03:00
Bruno Oliveira
5003bae0de
Fix 'at' string for non-numeric messages in approx()
2018-08-01 07:07:37 -03:00
Bruno Oliveira
611d254ed5
Improve error checking messages: add position and use pprint
2018-08-01 07:01:00 -03:00
Ronny Pfannschmidt
fcdc1d867e
fix #3745 - display absolute cache_dir if necessary
2018-08-01 08:25:37 +02:00
Bruno Oliveira
098dca3a9f
Use {!r} for a few other messages as well
2018-07-31 21:14:51 -03:00
Bruno Oliveira
bf7c188cc0
Improve error message for invalid types passed to pytest.approx()
...
* Hide the internal traceback
* Use !r representation instead of !s (the default for {} formatting)
2018-07-31 21:08:24 -03:00
Bruno Oliveira
8c9efd8608
Only call _collectfile on package instances
...
As discussed in #3751 , this feels like a hack, pushing it only so we can
see how it fares on CI and if there are better solutions out there
2018-07-31 19:06:30 -03:00
Kale Kundert
d02491931a
Fix the unused import.
2018-07-31 11:33:46 -07:00
Kale Kundert
032db159c9
Let black reformat the code...
2018-07-31 11:23:23 -07:00
Kale Kundert
cd2085ee71
approx(): Detect type errors earlier.
2018-07-31 00:26:35 -07:00
Kale Kundert
ad305e71d7
Improve docstrings for Approx classes.
2018-07-30 23:26:57 -07:00
Kale Kundert
7d8688d54b
Reflect dimension in approx repr for numpy arrays.
2018-07-30 23:23:17 -07:00
Bruno Oliveira
eada0b1fd7
Merge remote-tracking branch 'upstream/master' into release-3.7.0
2018-07-30 20:12:30 +00:00
Bruno Oliveira
8609f8d25a
Move warning definition to deprecated module
2018-07-30 14:25:29 -03:00
Bruno Oliveira
cf6d8e7e53
Fix test and update warning in pytest_namespace docs
2018-07-30 12:16:42 -03:00
Bruno Oliveira
e3d412d1f4
Warn when implementations exist for pytest_namespace hook
...
This hook has been deprecated and will be removed in the future.
Fix #2639
2018-07-29 22:20:23 -03:00
Kale Kundert
bf127a63b2
Need to iterate over the flattened array.
2018-07-27 11:24:42 -07:00
Bruno Oliveira
d0ba242c46
Implement change suggested by @kalekundert in PR
2018-07-27 15:07:20 -03:00
Bruno Oliveira
57b0c60cb4
Remove Testdir.run_example as recommended
2018-07-26 20:10:40 -03:00
Bruno Oliveira
011f88f7e7
Deprecate calling fixture functions directly
...
This will now issue a RemovedInPytest4Warning when the user calls
a fixture function directly, instead of requesting it from test
functions as is expected
Fix #3661
2018-07-26 19:58:42 -03:00
abrammer
f0db64ac2e
drop the duplicate approx call
...
update test to include both np.array(actual) and np.array(expected)
2018-07-24 21:18:44 -04:00
Bruno Oliveira
f5165064ee
Make yield_fixture just call fixture to do its work
...
Since fixture and yield_fixture are identical, they should call
the same code; as it was, the code inside them was already starting
to deviate.
2018-07-22 09:41:03 -03:00
Bruno Oliveira
c9a0881309
Isolate the code that resolves the fixturefunc to a separate function
...
pytest_fixture_setup was somewhat convoluted because it was trying
to do too many things.
2018-07-22 09:37:41 -03:00
Bruno Oliveira
5167933395
Move teardown code of yield fixtures to a partial to avoid leaks
...
As it were before, it was keeping a reference to fixturefunc and it
alive when an error occurred
2018-07-22 09:27:34 -03:00
Alan
7bff5866b1
bugfix in ApproxNumpy initialisation, use keywords for arguments now
2018-07-18 17:29:55 -04:00
Bruno Oliveira
0bb29d5649
Merge pull request #3685 from nicoddemus/merge-master-into-features
...
Merge master into features
2018-07-15 16:53:39 -03:00
Bruno Oliveira
ac9ceaacd8
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2018-07-15 11:54:14 -03:00
Tadek Teleżyński
d2fe619120
Fix truncated locals in verbose mode
2018-07-15 11:30:26 -03:00
Vlad Shcherbina
58e77f58bd
Replace broken type annotations with type comments
...
Fixes #3635 .
2018-07-15 16:58:39 +03:00
Bruno Oliveira
f6ceedd15b
Merge pull request #3636 from RonnyPfannschmidt/fixturetest-examples
...
[RFC] Fixturetest examples - move test contents to use example scripts for contents
2018-07-11 23:29:33 -03:00
Bruno Oliveira
3e599dc149
Check that param sets match number of args during _for_parametrize
...
It makes sense to validate them during creation of the parameter set
2018-07-11 22:57:53 -03:00
Bruno Oliveira
54fbc6f6e1
Refactor parametrize() code for readability
...
Extract the parametrize() block of code into methods for better
readability
2018-07-11 21:29:21 -03:00
Anthony Sottile
61301d934e
Remove some extraneous `# noqa` comments
...
This was partially automated with https://github.com/asottile/yesqa
_with a few caveats_:
- it was run under python2 (chosen arbitrarily, when run under python3 other
things were changed)
- I used `git checkout -p` to revert the removal of `noqa` comments from
`cmp()` lines.
2018-07-08 17:05:52 -07:00
Anthony Sottile
4ae93a7a07
Remove obsolete __future__ imports
2018-07-08 08:37:02 -07:00
Anthony Sottile
42bbb4fa8a
Use -mpytest when invoking pytest in pytester
2018-07-07 17:18:44 -07:00
Bruno Oliveira
303133f013
Merge pull request #3647 from jeffreyrack/3610-add-trace-option
...
3610 add trace option
2018-07-07 10:05:34 -03:00
Bruno Oliveira
027d2336b8
Add minimal docs for package-scoped fixtures (experimental)
2018-07-05 21:56:31 -03:00
Bruno Oliveira
3c19370cec
Merge remote-tracking branch 'upstream/features' into jonozzz/features
2018-07-05 18:15:17 -03:00
Bruno Oliveira
7696d5371a
Merge remote-tracking branch 'upstream/master' into features
2018-07-04 18:49:35 -03:00