Bruno Oliveira
768edde899
Merge pull request #2624 from nicoddemus/lf-report-after-collection
...
Fix --last-failed reported items in terminal
2017-07-28 14:48:23 -03:00
Bruno Oliveira
7a12acb6a1
Fix linting
2017-07-28 08:54:55 -03:00
Bruno Oliveira
5acb64be90
Add versionadded tag to pytest_report_collectionfinish hook
2017-07-28 08:54:55 -03:00
Bruno Oliveira
75e6f7717c
Use new hook to report accurate tests skipped in --lf and --ff
2017-07-28 08:54:55 -03:00
Ronny Pfannschmidt
17121960b4
Merge pull request #2621 from nicoddemus/cumulative-cache
...
Make cache plugin cumulative
2017-07-28 13:46:37 +02:00
Bruno Oliveira
eb1bd3449e
xfail and skipped tests are removed from the "last-failed" cache
...
This accommodates the case where a failing test is marked as
skipped/failed later
2017-07-27 18:43:04 -03:00
Bruno Oliveira
22212c4d61
Add xfail specific tests
2017-07-27 14:40:21 -03:00
Bruno Oliveira
62810f61b2
Make cache plugin always remember failed tests
2017-07-27 14:40:21 -03:00
Ronny Pfannschmidt
e97fd5ec55
Merge pull request #2623 from nicoddemus/post-collection-report-hook
...
Introduce new pytest_report_collectionfinish hook
2017-07-27 17:17:21 +02:00
Bruno Oliveira
17c544e793
Introduce new pytest_report_collectionfinish hook
...
Fix #2622
2017-07-27 10:44:29 -03:00
Ronny Pfannschmidt
ddf1751e6d
Merge pull request #2613 from nicoddemus/features
...
Merge master into features
2017-07-27 07:59:49 +02:00
Bruno Oliveira
3d89905114
Merge remote-tracking branch 'upstream/master' into features
2017-07-26 19:01:28 -03:00
Bruno Oliveira
1a9bc141a5
Merge pull request #2620 from mihaic/multiple-issues-in-changelog
...
Show multiple issue links in CHANGELOG entries
2017-07-26 16:00:00 -03:00
Mihai Capotă
10ded399d8
Show multiple issue links in CHANGELOG entries
...
Restores the functionality removed in PR #2488 .
2017-07-26 10:58:06 -07:00
Bruno Oliveira
dd294aafb3
Merge pull request #2557 from blueyed/EncodedFile-name
...
capture: ensure name of EncodedFile being a string
2017-07-26 10:39:10 -03:00
Bruno Oliveira
2c2cf81d0a
Merge pull request #2580 from andras-tim/fix-runpytest-subprocess
...
Avoid interactive pdb when pytest tests itself - fix #2023
2017-07-26 10:37:48 -03:00
Daniel Hahler
0603d1d500
capture: ensure name of EncodedFile being a string
...
Fixes https://github.com/pytest-dev/pytest/issues/2555 .
2017-07-25 20:37:37 +02:00
Bruno Oliveira
79097e84e2
Merge pull request #2615 from blueyed/revisit_contributing.rst
...
Revisit CONTRIBUTING.rst
2017-07-25 13:40:45 -03:00
Bruno Oliveira
1a42e26586
Improve changelog wording to be more user-oriented
2017-07-25 13:37:06 -03:00
Bruno Oliveira
595ecd23fd
Merge pull request #2548 from blueyed/skip-fix-lineno
...
Fix lineno offset in show_skipped
2017-07-25 13:35:14 -03:00
Daniel Hahler
949a1406f0
Revisit CONTRIBUTING.rst
2017-07-25 18:27:26 +02:00
Bruno Oliveira
71947cb4f0
Merge pull request #2546 from blueyed/better-skip-not-allowed-error
...
[RFC] Improve error message for CollectError with skip/skipif
2017-07-25 11:19:25 -03:00
Daniel Hahler
869eed9898
Fix lineno offset in show_skipped
...
The line number is 0-based here, so add 1.
2017-07-25 15:19:47 +02:00
Daniel Hahler
72531f30c0
Improve error message for CollectError with skip/skipif
2017-07-25 15:14:28 +02:00
Bruno Oliveira
73c6122f35
Merge remote-tracking branch 'upstream/master' into features
2017-07-24 21:12:51 -03:00
Bruno Oliveira
70d9f8638f
Merge pull request #2610 from AgriConnect/doctest-lineno
...
Report lineno from doctest
2017-07-24 16:29:02 -03:00
Nguyễn Hồng Quân
d40d77432c
Add test case for DoctestItem.reportinfo()
2017-07-24 23:07:45 +07:00
Bruno Oliveira
e44284c125
Merge pull request #2611 from segevfiner/patch-1
...
Early import colorama so that it get's the correct terminal
2017-07-24 12:37:22 -03:00
Nguyễn Hồng Quân
dea671f8ba
Add changelog for #2610
2017-07-24 22:01:03 +07:00
Nguyễn Hồng Quân
cdaa720bc4
Merge remote-tracking branch 'upstream/master' into doctest-lineno
2017-07-24 21:49:35 +07:00
Segev Finer
d0ecfdf00f
Delete trailing whitespace
2017-07-24 16:55:50 +03:00
Florian Bruhin
81ad185f0d
Merge pull request #2595 from nicoddemus/docs-rootdir-pythonpath
...
Clarify PYTHONPATH changes and ``rootdir`` roles
2017-07-24 15:06:38 +02:00
Bruno Oliveira
d90bef44cc
Update changelog file for #2510
2017-07-24 09:31:16 -03:00
Segev Finer
df12500661
Create 2611.bugfix
2017-07-24 15:28:20 +03:00
Segev Finer
43544a431c
Early import colorama so that it get's the correct terminal
2017-07-24 15:17:39 +03:00
Bruno Oliveira
0aa2480e6a
Fix travis build after change from "precise" to "trusty"
...
Travis recently has changed its dist from "precise" to "trusty", so
some Python versions are no longer installed by default
2017-07-24 07:44:04 -03:00
Florian Bruhin
6473a81b8b
Merge pull request #2608 from nicoddemus/contributing-update
...
Update PR guide and add a "short" version
2017-07-24 12:14:56 +02:00
Nguyễn Hồng Quân
af2c153324
Report lineno from doctest
...
This is to fix pytest-sugar#122 issue.
2017-07-24 11:52:24 +07:00
Florian Bruhin
309152d9fd
Merge pull request #2599 from nicoddemus/turn-warnings-into-errors
...
Turn warnings into errors WIP, waiting #2598
2017-07-23 11:27:14 +02:00
Bruno Oliveira
d5bb2004f9
Fix travis build after change from "precise" to "trusty"
...
Travis recently has changed its dist from "precise" to "trusty", so
some Python versions are no longer installed by default
2017-07-23 00:50:28 -03:00
Bruno Oliveira
bda07d8b27
Ignore socket warnings on windows for trial tests
2017-07-22 21:44:18 -03:00
Bruno Oliveira
0726d9a09f
Turn warnings into errors in pytest's own test suite
...
Fix #2588
2017-07-22 21:44:18 -03:00
Bruno Oliveira
61219da0e2
Update PR guide and add a "short" version
2017-07-22 16:08:18 -03:00
Bruno Oliveira
1b732fe361
Merge pull request #2606 from kalekundert/simplify-numpy
...
Make approx more compatible with numpy
2017-07-22 14:21:08 -03:00
Bruno Oliveira
b35554ca2b
Merge pull request #2607 from kalekundert/remove-code-dup
...
Remove stale copies of raises and approx
2017-07-22 14:20:53 -03:00
Kale Kundert
7e0553267d
Remove unused import.
2017-07-22 09:19:13 -07:00
Kale Kundert
ebc7346be4
Raise TypeError for types that can't be compared to arrays.
2017-07-22 09:05:12 -07:00
Kale Kundert
a3b35e1c4b
Remove `raises` and `approx` from `python.py`.
...
These two classes were recently moved to `python_api.py`, but it seems
that they found their way back into the original file somehow. This
commit removes them again to avoid out-of-date code duplication.
2017-07-22 08:36:15 -07:00
Kale Kundert
4c45bc9971
Add the numpy tests back into tox.ini
...
I'm not sure why they were removed...
2017-07-22 08:24:45 -07:00
Kale Kundert
495f731760
Simplify how comparisons with numpy arrays work.
...
Previously I was subverting the natural order of operations by
subclassing from `ndarray`, but it turns out that you can tell just
numpy to call your operator instead of its by setting the
`__array_priority__` attribute on your class. This is much simpler, and
it turns out the be a little more robust, too.
2017-07-22 07:52:03 -07:00