Bruno Oliveira
b62aef3372
Merge branch 'master' into features
2017-07-04 12:44:58 -03:00
Bruno Oliveira
b63f6770a1
Preparing release version 3.1.3
2017-07-03 23:29:13 +00:00
Bruno Oliveira
8a8687122d
Add wheel to tasks/requirements.txt: required for package creation
2017-07-03 23:28:29 +00:00
Bruno Oliveira
7277fbdb20
Fix SMTP port in fixture docs
...
Also add timeout to avoid regen getting stuck due
to connection problems
Fix #2509
2017-07-03 20:21:41 -03:00
Bruno Oliveira
6908d93ba1
Merge pull request #2475 from ant31/master
...
[wip] Fix ignore_path condition
2017-07-03 18:57:17 -03:00
Bruno Oliveira
c578418791
Add changelog for triple leading '/' problem.
2017-07-03 12:39:17 -03:00
Ronny Pfannschmidt
0303d95a53
Merge pull request #2531 from waisbrot/staticmethods
...
Allow staticmethods to be detected as test functions
2017-06-29 16:18:55 +02:00
Nathaniel Waisbrot
9b9fede5be
allow staticmethods to be detected as test functions
...
Allow a class method decorated `@staticmethod` to be collected as a test
function (if it meets the usual criteria).
This feature will not work in Python 2.6 -- static methods will still be
ignored there.
2017-06-29 07:44:36 -04:00
Ronny Pfannschmidt
9b51fc646c
Merge pull request #2526 from nicoddemus/merge-master-into-features
...
Merge master into features
2017-06-24 11:25:35 +02:00
Ronny Pfannschmidt
6eeab45a8f
Merge pull request #2525 from nicoddemus/deprecate-old-style
...
Add changelog entry explicitly deprecating old-style classes from pytest API
2017-06-24 11:24:53 +02:00
Antoine Legrand
16df4da1f7
Fix exclude_path check
2017-06-24 10:58:47 +02:00
Bruno Oliveira
3de93657bd
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2017-06-24 00:47:48 -03:00
Bruno Oliveira
1906f8c565
Merge pull request #2524 from RonnyPfannschmidt/fix-2427
...
introduce deprecation warnings for legacy parametersets, fixes #2427
2017-06-24 00:41:44 -03:00
Bruno Oliveira
655d44b413
Add changelog entry explicitly deprecating old-style classes from pytest API
...
Related to #2147
2017-06-24 00:37:40 -03:00
Ronny Pfannschmidt
0d0b01bded
introduce deprecation warnings for legacy parametersets, fixes #2427
2017-06-23 22:06:49 +02:00
Bruno Oliveira
6e2b5a3f1b
Merge pull request #2523 from RonnyPfannschmidt/vendoring-tasks
...
Vendoring tasks
2017-06-23 16:55:32 -03:00
Ronny Pfannschmidt
b3bf7fc496
add tasks for updating vendored libs
2017-06-23 21:26:45 +02:00
Ronny Pfannschmidt
bb659fcffe
Merge pull request #2521 from nicoddemus/show-trivial-changelog
...
Show "trivial" category in CHANGELOG
2017-06-23 17:38:36 +02:00
Bruno Oliveira
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
Bruno Oliveira
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
Ronny Pfannschmidt
8d5f2872d3
minor code style fix
2017-06-23 11:59:03 +02:00
Ronny Pfannschmidt
b0b6c355f7
fixup changelog, thanks Bruno
2017-06-23 11:09:16 +02:00
Ronny Pfannschmidt
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
Bruno Oliveira
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
Ronny Pfannschmidt
1d926011a4
add deprecation warnings for using markinfo attributes
2017-06-22 15:12:50 +02:00
Bruno Oliveira
ff8dbd0ad8
Add tracebackhide to function call form of deprecated_call
2017-06-22 08:54:39 -03:00
Ronny Pfannschmidt
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
Ronny Pfannschmidt
c791895c93
changelog addition
2017-06-22 10:50:46 +02:00
Ronny Pfannschmidt
19b12b22e7
store pristine marks on function.pytestmark
...
fixes #2516
2017-06-22 10:48:45 +02:00
Ronny Pfannschmidt
64ae6ae25d
extract application of marks and legacy markinfos
2017-06-22 10:41:28 +02:00
Ronny Pfannschmidt
bdec2c8f9e
move marker transfer to _pytest.mark
2017-06-22 08:45:10 +02:00
Ronny Pfannschmidt
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
Bruno Oliveira
f2ba8d70b9
Fix typo and add suggestion from review
2017-06-21 09:06:52 -03:00
Bruno Oliveira
afe847ecdc
fixture docs: highlight difference between yield and addfinalizer methods
...
Fix #2508
2017-06-20 23:43:34 -03:00
Ronny Pfannschmidt
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
Bruno Oliveira
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
Ronny Pfannschmidt
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
Ronny Pfannschmidt
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
Ronny Pfannschmidt
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
Bruno Oliveira
97367cf773
Remove obsolete comment from rewrite.py
...
This was made obsolete by 021e843427
2017-06-13 23:12:33 -03:00
Bruno Oliveira
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
Bruno Oliveira
4e4ebbef5a
Improve test to ensure the expected function is re-raised
2017-06-13 20:16:48 -03:00
Bruno Oliveira
b09d60c60a
Fix decode error in Python 2 for doctests in docstrings
...
Fix #2434
2017-06-13 19:41:34 -03:00
Raphael Pierzina
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
Raphael Pierzina
0e73724e58
Add changelog/2499.trivial
2017-06-13 15:15:52 +02:00
Raphael Pierzina
9970dea8c1
Update copyright date in doc pages
2017-06-13 15:00:52 +02:00
Raphael Pierzina
218af42325
Update copyright date in LICENSE and README.rst
2017-06-13 14:58:07 +02:00
Ronny Pfannschmidt
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
Max Moroz
4a992bafdb
Changelog
2017-06-12 19:55:30 -07:00
Max Moroz
21137cf8c5
Add firstresult=True to the hook docs
2017-06-12 19:45:35 -07:00
