3de93657bd
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2017-06-24 00:47:48 -03:00
6e2b5a3f1b
Merge pull request #2523 from RonnyPfannschmidt/vendoring-tasks
...
Vendoring tasks
2017-06-23 16:55:32 -03:00
b3bf7fc496
add tasks for updating vendored libs
2017-06-23 21:26:45 +02:00
bb659fcffe
Merge pull request #2521 from nicoddemus/show-trivial-changelog
...
Show "trivial" category in CHANGELOG
2017-06-23 17:38:36 +02:00
6de19ab7ba
Show "trivial" category in CHANGELOG
...
I think it might sense to display in the CHANGELOG internal or
trivial changes because they might trip users between releases.
For example, a note about an internal refactoring (like
moving a class between modules) is useful for a user
that has been using the internal API. Of course
we are not breaking anything because it was an internal API, but no
reason not to save time for users who did use it.
2017-06-23 12:33:50 -03:00
bab18e10eb
Merge pull request #2517 from RonnyPfannschmidt/mark-expose-nontransfered
...
Mark expose nontransfered marks via pytestmark property
2017-06-23 10:15:39 -03:00
8d5f2872d3
minor code style fix
2017-06-23 11:59:03 +02:00
b0b6c355f7
fixup changelog, thanks Bruno
2017-06-23 11:09:16 +02:00
23d016f114
address review comments
...
* enhance api for fetching marks off an object
* rename functions for storing marks
* enhance deprecation message for MarkInfo
2017-06-23 11:05:38 +02:00
22b7701431
Merge pull request #2480 from nicoddemus/issue-2469-deprecated-call-ctx
...
deprecated_call context manager captures warnings already raised
2017-06-22 10:53:28 -03:00
1d926011a4
add deprecation warnings for using markinfo attributes
2017-06-22 15:12:50 +02:00
ff8dbd0ad8
Add tracebackhide to function call form of deprecated_call
2017-06-22 08:54:39 -03:00
5e832017d5
Merge pull request #2487 from nicoddemus/recursion-error-2486
...
Fix internal error when trying to detect the start of a recursive traceback
2017-06-22 13:40:32 +02:00
c791895c93
changelog addition
2017-06-22 10:50:46 +02:00
19b12b22e7
store pristine marks on function.pytestmark
...
fixes #2516
2017-06-22 10:48:45 +02:00
64ae6ae25d
extract application of marks and legacy markinfos
2017-06-22 10:41:28 +02:00
bdec2c8f9e
move marker transfer to _pytest.mark
2017-06-22 08:45:10 +02:00
4a62102b57
Merge pull request #2511 from nicoddemus/addfinalizer-docs
...
fixture docs: highlight difference between yield and addfinalizer methods
2017-06-22 07:59:44 +02:00
f2ba8d70b9
Fix typo and add suggestion from review
2017-06-21 09:06:52 -03:00
afe847ecdc
fixture docs: highlight difference between yield and addfinalizer methods
...
Fix #2508
2017-06-20 23:43:34 -03:00
8c3c4307db
Merge pull request #2503 from nicoddemus/remove-manifest-check
...
Remove MANIFEST.in and related lint check
2017-06-15 14:23:16 +02:00
731c35fcab
Remove MANIFEST.in and related lint check
...
Because setuptools_scm already includes all version-controlled files
in an sdist, we don't need to maintain a MANIFEST.in file and anymore
See pytest-dev/pytest-xdist#161
2017-06-14 07:43:21 -04:00
31b971d79d
Merge pull request #2488 from nicoddemus/issue-links-changelog
...
Add issue links in the CHANGELOG entries
2017-06-14 10:58:59 +02:00
4e57a39067
Merge pull request #2468 from nicoddemus/collection-report-2464
...
Fix incorrect "collected items" report when specifying tests on the command-line
2017-06-14 10:57:57 +02:00
af0344e940
Merge pull request #2500 from nicoddemus/issue-2434-doctest-modules
...
Fix decode error in Python 2 for doctests in docstrings
2017-06-14 05:52:44 +02:00
97367cf773
Remove obsolete comment from rewrite.py
...
This was made obsolete by 021e843427
2017-06-13 23:12:33 -03:00
336cf3e1f5
Merge pull request #2496 from rmfitzpatrick/pytest2440_handle_subrequest_finalizer_exceptions
...
Handle exceptions in subrequest finalizers
2017-06-13 23:03:03 -03:00
4e4ebbef5a
Improve test to ensure the expected function is re-raised
2017-06-13 20:16:48 -03:00
b09d60c60a
Fix decode error in Python 2 for doctests in docstrings
...
Fix #2434
2017-06-13 19:41:34 -03:00
0908f40e43
Merge pull request #2499 from hackebrot/update-license-dates
...
Update copyright dates in LICENSE, README.rst and in the documentation
2017-06-13 17:18:08 +02:00
0e73724e58
Add changelog/2499.trivial
2017-06-13 15:15:52 +02:00
9970dea8c1
Update copyright date in doc pages
2017-06-13 15:00:52 +02:00
218af42325
Update copyright date in LICENSE and README.rst
2017-06-13 14:58:07 +02:00
6fa7b16482
Merge pull request #2497 from pkch/firstresult
...
Docs: clarify when hooks stop after the first non-None result
2017-06-13 07:17:05 +02:00
4a992bafdb
Changelog
2017-06-12 19:55:30 -07:00
21137cf8c5
Add firstresult=True to the hook docs
2017-06-12 19:45:35 -07:00
5a856b6e29
handle and reraise subrequest finalizer exceptions
2017-06-12 21:26:42 -04:00
9bd8907716
Merge pull request #2489 from RonnyPfannschmidt/move-python-api
...
Move python api code to own file
2017-06-11 11:25:35 -03:00
f8b2277413
changelog fragment
2017-06-11 14:17:40 +02:00
6be57a3711
move python api helpers out of the python module
...
this separates exposed normal api from collection elements
2017-06-11 12:27:16 +02:00
36251e0db4
move approx to own file
2017-06-11 12:15:30 +02:00
f0541b685b
Improve CHANGELOG formatting a bit
2017-06-10 12:31:20 -03:00
536f1723ac
Add issue links in the CHANGELOG entries
...
This unfortunately no longer supports multiple entries with the same text,
but this is worth the improved readability and navigation IMO
2017-06-10 12:25:40 -03:00
8bb589fc5d
Fix internal error when trying to detect the start of a recursive traceback.
...
Fix #2486
2017-06-09 19:26:26 -03:00
467c526307
Merge remote-tracking branch 'upstream/master' into features
2017-06-09 18:33:46 -03:00
b2d7c26d80
Merge pull request #2483 from nicoddemus/release-3.1.2
...
Preparing release version 3.1.2
2017-06-09 08:18:43 -03:00
7cbf265bb5
Preparing release version 3.1.2
2017-06-08 17:37:42 -04:00
917b9a8352
Merge pull request #2476 from nicoddemus/fix-2459-numpy-comparison
...
Fix internal error when a recursion error occurs and frames contain objects that can't be compared
2017-06-07 20:34:36 +02:00
2127a2378a
Fix internal error with recursive tracebacks with that frames contain objects that can't be compared
...
Fix #2459
2017-06-07 14:40:13 -03:00
d2db6626cf
Merge pull request #2466 from nicoddemus/remove-unicode-warning
...
Remove UnicodeWarning from pytest warnings
2017-06-07 08:00:36 +02:00
Bruno Oliveira
Ronny Pfannschmidt
Ronny Pfannschmidt
Raphael Pierzina
Max Moroz
Ryan Fitzpatrick