9ad2b75038
skipping: replace _evalskip with a more consistent _skipped_by_mark
2017-10-06 10:44:49 +02:00
a33650953a
remove unused import
2017-10-06 10:44:49 +02:00
667e70f555
switch out the placeholder MarkEvaluator in unittest plugin
2017-10-06 10:44:49 +02:00
e7a4d3d8cf
Merge remote-tracking branch 'upstream/master' into features
2017-10-04 17:28:34 -03:00
9ee0a1f5c3
Merge pull request #2813 from nicoddemus/release-3.2.3
...
Preparing release version 3.2.3
2017-10-04 17:27:36 -03:00
6b91bc88de
Preparing release version 3.2.3
2017-10-03 21:42:34 +00:00
61eb20df71
Merge pull request #2810 from nicoddemus/issue-2809
...
Fix warning about non-ascii warnings even when they are ascii
2017-10-03 20:56:23 +02:00
df6d5cd4e7
Use ascii_escaped to escape unicode warnings
2017-10-03 12:19:37 -03:00
fbb9e9328b
Fix warning about non-ascii warnings even when they are ascii
...
Fix #2809
2017-10-03 07:39:53 -03:00
6690b8a444
Merge pull request #2807 from xuanluong/issue-1442-mention-not--k-help
...
[doc] Add example of -k 'not test' in help text
2017-10-01 14:32:34 -03:00
7093d8f65e
Add example of -k 'not test' in help text
2017-09-30 18:43:20 -04:00
d132c502e6
Merge pull request #2804 from nicoddemus/terminal-reporter-tw-2803
...
Deprecate TerminalReporter._tw
2017-09-28 10:01:24 +02:00
3b30c93f73
Deprecate TerminalReporter._tw
...
Fix #2803
2017-09-27 17:16:34 -03:00
c0c859ce99
Merge pull request #2799 from blueyed/cleanup-tox.ini
...
minor: cleanup tox.ini
2017-09-27 15:36:10 -03:00
87596714bf
minor: cleanup tox.ini
2017-09-27 00:45:10 +02:00
de0d19ca09
Merge pull request #2790 from nicoddemus/merge-master-into-features
...
Merge master into features
2017-09-20 10:25:56 +02:00
966391c77e
Merge pull request #2789 from Avira/master
...
Don't crash if an item has no _fixtureinfo attribute
2017-09-19 17:34:43 -03:00
9c8847a0cb
Merge pull request #2792 from Avira/fix-tox-docs-link
...
fix tox documentation link
2017-09-19 12:31:21 -03:00
58aaabbb10
fix tox documentation link
2017-09-19 16:57:16 +02:00
2802135741
fix 'DoctestItem' object has no attribute '_fixtureinfo'
...
* doxtests don't seem to have this attribute, so nothing will be written in that case.
* tried to be a good boy scout and tidied up surrounding code a bit (comments, shadowed/unused names, removed random new lines, naming things)
2017-09-19 12:41:12 +02:00
a2da5a691a
Update tox and appveyor environments to use py36 by default
2017-09-18 21:38:15 -03:00
afe7966683
Fix call to outcome.get_result now that outcome.result is deprecated
2017-09-18 21:36:54 -03:00
3ebfb881c9
Merge remote-tracking branch 'upstream/master' into features
2017-09-18 19:10:31 -03:00
bf77daa2ee
Merge pull request #2785 from nicoddemus/py36
...
Change to py36 as main environment for Python 3 environments in tox
2017-09-17 09:19:06 +02:00
9933635cf7
Change to py36 as main environment for Python 3 environments in tox
...
This also has the benefit of working around Travis recent failures
in Python 3.5 environments.
2017-09-16 19:18:07 -03:00
ac5c5cc1ef
Merge pull request #2750 from evanunderscore/fix-filescompleter
...
Fix crash in FastFilesCompleter with no prefix
2017-09-14 20:11:43 -03:00
810320f591
Small fixes to development_guide: title and label names
...
* Fix title to use a proper "title" section marker
* Fix labels by adding a " " after the ":"
* Fix OS labels after obvious mishap
* Sort labels
2017-09-14 19:58:56 -03:00
25d2acbdb2
Merge pull request #2760 from nicoddemus/labels
...
Add development guide to docs
2017-09-14 19:20:45 -03:00
52c134aed3
Add development guide to docs
2017-09-13 19:32:40 -03:00
70cdfaf661
Merge pull request #2754 from nicoddemus/xfail_strict
...
Set xfail_strict=True in pytest's own test suite
2017-09-13 09:01:32 +02:00
abfd9774ef
Remove xfail mark from passing test in py26
2017-09-12 17:59:09 -03:00
e57cc55719
Merge pull request #2766 from xuanluong/issue-1548-docs-multiple-calls-metafunc-parametrize
...
Update documentation on multiple calls of metafunc.parametrize
2017-09-10 02:07:06 -03:00
696c702da7
Update documentation on multiple calls of metafunc.parametrize
2017-09-10 00:23:23 -04:00
bee2c864d8
Merge pull request #2765 from xuanluong/pass-callable-to-marker-typo
...
Fix typo in example of passing a callable to markers
2017-09-09 21:03:13 -03:00
e27a0d69aa
Rename changelog file to PR id number
2017-09-09 18:26:15 -04:00
15222ceca2
Fix typo in example of passing a callable to markers
2017-09-09 18:22:23 -04:00
3c1ca03b9c
Merge pull request #2763 from jhamman/docs/skipif_class_warning
...
add warning to skipping docs re marker inheritance
2017-09-09 15:15:47 -03:00
25ed4edbc7
Merge pull request #2764 from xuanluong/issue-2758-fix-mark-decorator-equality
...
[bugfix] Checking MarkDecorator equality returns False for non-MarkDecorator object
2017-09-09 10:03:49 +02:00
1e93089165
[bugfix] Checking MarkDecorator equality returns False for non-MarkDecorator object
2017-09-09 01:31:08 -04:00
b2a8e06e4f
add warning to skipping docs re marker inheritance
2017-09-08 12:01:33 -07:00
9273e11f21
Merge branch 'master' into features
2017-09-07 13:59:10 -03:00
09349c344e
Merge pull request #2757 from nicoddemus/release-3.2.2
...
Preparing release version 3.2.2
2017-09-07 13:54:31 -03:00
6cf515b164
Fix crash in FastFilesCompleter with no prefix
2017-09-08 00:14:56 +10:00
6967f3070e
Merge pull request #2711 from massich/mimic_raises_signature_in_warns
...
[MRG][feature] Change warns signature to mimic the raises call
2017-09-07 13:19:09 +02:00
a0c6758202
Add changelog
2017-09-07 10:51:14 +02:00
80d165475b
Add documentation
2017-09-07 10:28:52 +02:00
aa6a67044f
Add match_regex functionality to warns
2017-09-07 09:58:03 +02:00
c52f87ede3
Preparing release version 3.2.2
2017-09-06 21:37:57 +00:00
549f5c1a47
Merge pull request #2736 from xuanluong/issue-2604-documents-mark.with_args
...
[DOC] Add examples for mark.with_args
2017-09-06 16:33:01 -03:00
3f8ff7f090
[DOC] Add examples for mark.with_args
2017-09-06 14:26:28 -04:00
Ronny Pfannschmidt
Bruno Oliveira
Xuan Luong
Daniel Hahler
Oliver Bestwalter
Joe Hamman
Evan
Joan Massich