99496d9e5b
Merge pull request #2910 from RonnyPfannschmidt/scopenode-sanitize-specials
...
switch a special case in scope node lookup to a general one
2017-11-10 18:49:35 -02:00
983a09a2d4
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2017-11-10 18:33:02 -02:00
66fbebfc26
Merge pull request #2894 from nicoddemus/fix-linting-errors
...
Fix linting errors
2017-11-10 18:15:53 -02:00
0108f262b1
Fix typo in CHANGELOG
2017-11-10 18:15:09 -02:00
76f3be452a
remove unused _pytest.runner.NodeInfo class
2017-11-10 17:48:52 +01:00
c47dcaa713
switch a special case in scope node lookup to a general one
2017-11-10 17:35:42 +01:00
b2b1eb262f
Merge pull request #2906 from nicoddemus/larger-parametrize-section
...
Make the "examples" section more prominent in the docs for parametrize
2017-11-10 10:50:57 +01:00
9fce430c89
Merge pull request #2907 from nicoddemus/lazy-fixture
...
Mention pytest-lazy-fixture plugin in the proposal for parametrize_with_fixtures
2017-11-10 10:48:48 +01:00
e114feb458
Mention pytest-lazy-fixture plugin in the proposal for parametrize_with_fixtures
2017-11-09 20:14:24 -02:00
c09f69df2a
Make the "examples" section more prominent in the docs
...
I spent some time today figuring out why PR #2881 was not showing up
on doc/parametrize... then after some digging even on readthedocs
wondering if the last documentation build had failed, I realized the
docs I was looking for was in doc/example/parametrize instead.
The section that mentions this is very easy to miss, this makes it a
full fledged title and easier to find.
2017-11-09 19:25:30 -02:00
3900879a5c
Mark test_py2_unicode as xfail in PyPy2 on Windows
...
#2905
2017-11-09 19:17:17 -02:00
7b1cc55add
Merge pull request #2903 from pagles/docs-3.6
...
List python 3.6 in the documented supported versions
2017-11-08 22:57:28 +01:00
d904981bf3
Rename 2903.trivial to 2903.doc
2017-11-08 18:20:50 +02:00
f13333afce
Create changelog entry
2017-11-08 18:19:59 +02:00
fad1fbe381
List python 3.6 in the documented supported versions
2017-11-08 18:13:34 +02:00
c33074c8b9
Merge pull request #2641 from RonnyPfannschmidt/introduce-attrs
...
[RFC] Introduce attrs
2017-11-06 12:56:57 -02:00
b11640c1eb
Fix linting E722: do not use bare except
2017-11-04 13:59:10 -02:00
03829fde8a
Fix linting E741: ambiguous variable name
2017-11-04 13:59:10 -02:00
e351976ef4
Merge remote-tracking branch 'upstream/features' into RonnyPfannschmidt/introduce-attrs
2017-11-04 12:32:27 -02:00
b18a9deb4c
Merge pull request #2892 from nicoddemus/merge-master-into-features
...
Merge upstream/master into features
2017-11-04 08:15:28 +01:00
2e2f72156a
Merge pull request #2893 from fmichea/patch-1
...
Clarify language of proposal for fixtures parameters
2017-11-04 08:08:48 +01:00
22e9b006da
Add fragment per PR's guidelines.
2017-11-03 22:24:05 +01:00
802585cb66
Clarify language of proposal for parametrized fixtures
...
This change slightly modifies the language of the proposal document around use of fixture as parameters of pytest.mark.parametrize. When looking for documentation around this, I very quickly scrolled through this document and landed on the last paragraph thinking it was documenting a real function. This change attempts to make it less likely for this to happen.
2017-11-03 22:13:47 +01:00
d7e8eeef56
Merge pull request #2878 from RonnyPfannschmidt/collector-makeitem-deprecate
...
deprecate the public internal PyCollector.makeitem method
2017-11-03 17:13:18 -02:00
e58e8faf47
Add CHANGELOG entry for attrs module dependency
2017-11-03 17:07:33 -02:00
7d43225c36
Merge pull request #2877 from RonnyPfannschmidt/extract-extract-parameterset
...
move responsibility for parameterset extraction into parameterset class
2017-11-03 16:52:28 -02:00
460cae02b0
Small formatting fix in CHANGELOG
2017-11-03 16:51:59 -02:00
f3a119c06a
Merge upstream/master into features
2017-11-03 16:37:18 -02:00
d1aa553f73
add mocked integrationtest for the deprecationwarning of makeitem
2017-10-30 19:49:14 +01:00
cd747c48a4
Merge pull request #2874 from nicoddemus/fix-py27-xdist-envs-2843
...
Change directory for py27 xdist-related envs
2017-10-30 17:09:34 +01:00
07b2b18a01
introduce attrs as dependency and use it
...
for FixtureFunctionMarker and marks
2017-10-30 17:04:42 +01:00
766de67392
Fix linting error in deprecated.py
2017-10-30 16:35:34 +01:00
821f9a94d8
deprecate the public internal PyCollector.makeitem method
2017-10-30 16:35:23 +01:00
26019b33f8
Merge pull request #2882 from thisch/doctest_lineno
...
Fix context output handling for doctests
2017-10-30 09:57:25 +01:00
cb30848e5a
Merge pull request #2880 from samueldg/capture-result-namedtuple
...
Capture result namedtuple
2017-10-30 09:47:06 +01:00
d00e2da6e9
Merge pull request #2881 from dawran6/2658
...
Document pytest.param
2017-10-30 09:36:33 +01:00
2f993af54a
Fix context output handling for doctests
...
Show full context of doctest source in the pytest output, if the lineno of
failed example in the docstring is < 9.
2017-10-29 20:06:10 +00:00
af5e9238c8
Document pytest.param
...
Append example for pytest.param in the example/parametrize document.
2017-10-28 14:25:09 -07:00
8e178e9f9b
Add myself to AUTHORS list
2017-10-28 15:08:53 -04:00
8e28815d44
Add changelog entry for issue #2879
2017-10-28 15:08:07 -04:00
b27dde24d6
Use a nametuple for `readouterr()` results
...
This allows accessing `out` and `err` directly by attribute,
while preserving tuple unpacking.
Also added tests, one for the `capsys` fixture, and one for the
`MultiCapture` class itself.
2017-10-28 14:53:19 -04:00
4a436f2255
move responsibility for parameterset extraction into parameterset class
2017-10-27 17:55:07 +02:00
27cea340f3
Remove trailing whitespace
2017-10-26 21:55:28 -02:00
c3ba9225ef
Change directory for py27 xdist-related envs
...
The "filter_traceback" function was not filtering the frames
that belonged to the pytest internals.
"filter_traceback" was receiving *relative* paths when running with
xdist, and full paths in non-distributed runs; for this reason
the traceback function did not consider the received path to be
relative to the pytest internal modules.
Fix #2843
2017-10-26 21:34:41 -02:00
111d640bdb
Merge pull request #2873 from stephenfin/doc/skipping-entire-files
...
doc: Include collector config in the skip doc
2017-10-26 20:21:31 -02:00
734c435d00
Merge pull request #2870 from Perlence/rewrite-python-37-docstring
...
Adapt the Python 3.7 AST changes
2017-10-26 20:15:22 -02:00
27bb2eceb4
Add comment about why we remove docstrings on test_assertrewrite
...
As explained in pytest-dev/pytest#2870
2017-10-26 20:15:05 -02:00
383239cafc
doc: Include collector config in the skip doc
...
None of the decorators are sufficient to skip an entire file, for
example if the file contain invalid code for a given Python version.
Simply link to details about customizing the collector.
Signed-off-by: Stephen Finucane <stephen@that.guru>
2017-10-26 17:14:29 +01:00
fd7bfa30d0
Put imports on the last line unless there are other exprs
2017-10-25 11:05:07 +03:00
3427d27d5a
Try to get docstring from module node
2017-10-25 10:54:43 +03:00
Bruno Oliveira
Ronny Pfannschmidt
Florian Bruhin
Yorgos Pagles
Franck Michea
Thomas Hisch
Daw-Ran Liou
Samuel Dion-Girardeau
Stephen Finucane
Sviatoslav Abakumov