9b48613baa
Preparing release version 3.1.0
2017-05-19 18:12:59 -04:00
36cf89a2de
Merge remote-tracking branch 'upstream/master' into features
2017-05-19 18:01:56 -04:00
598aefc686
small fix in an example from the docs
2017-05-18 21:18:09 +07:00
7af0e6bda1
Merge pull request #2415 from flub/training
...
Remove past training
2017-05-17 20:57:50 -03:00
f7247dc99d
Remove past training
...
Leaving the sidebar as an example for in the future.
2017-05-17 22:47:51 +01:00
70bcd1fb7b
Add a reference to Python testing book to talks docs
2017-05-17 17:17:19 -03:00
00e7ee532e
Fix minor regendoc issues
2017-05-15 21:57:04 -03:00
fe49c78f32
Merge remote-tracking branch 'upstream/master' into release-3.1
2017-05-15 21:56:44 -03:00
bd708068ab
Merge branch 'features' into regendoc-reduce-version-noise
2017-05-14 14:34:07 -03:00
03753ca201
intermediate state after attempt with the plain env, DONT MERGE
2017-05-13 13:25:52 +02:00
d1e44d16e7
regenerate docs from the pytest env
2017-05-12 22:51:20 +02:00
2ab8d12fe3
Update changelog and add usage info
2017-05-12 17:48:50 -03:00
c765fa6d04
add regendoc normaliz for pytest --version
2017-05-12 22:38:50 +02:00
f1c4e2c032
regendoc: reduce version noise by replacing minor/patch with placeholders
2017-05-12 22:17:40 +02:00
52c67af63c
Clarify opening paragraph of parameterization docs
...
- Fix a few small grammar mistakes
- Rewrite a few sentences to make them shorter and easier to read
2017-05-09 10:02:08 -04:00
f3b359f5b8
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
...
# Conflicts:
# _pytest/capture.py
# _pytest/compat.py
# _pytest/python.py
# testing/python/collect.py
# testing/test_mark.py
2017-05-03 19:04:53 -03:00
f0533194ed
Update fixture.rst
...
Remove yet another not needed `request` argument in fixture definition.
2017-04-26 10:31:53 +02:00
a9b44c4529
Update docs
...
Remove not needed `request` arg in order to simplify the example.
2017-04-25 16:35:19 +02:00
90be44c812
Document PYTEST_DONT_REWRITE
...
Fixes #2203
2017-04-19 08:19:19 -03:00
f2300fbab2
Fix links in docs
2017-04-06 23:29:41 -03:00
45852386e5
Fix small typo in docs
2017-04-06 23:02:47 -03:00
5462697924
Small formatting fixes to nose.rst
2017-04-06 23:01:26 -03:00
f7caa56a6b
moved documentation of conftest.py hack to nose.rst
2017-04-06 18:01:03 -07:00
3aa4fb62d6
Merge branch 'master' into master
2017-04-06 16:35:38 -07:00
44a3db3dc6
Pin sphinx to 1.4 when generating docs to workaround search issues on RTD
...
Fix #2302
2017-04-06 18:09:01 -03:00
809c36e1f6
add a changelog note for pytest_namespace
2017-03-28 11:45:06 +02:00
eabe3eed6b
Add docs for the warnings functionality
2017-03-20 23:35:01 -03:00
d58bc14645
Added 'Possible exit codes' section to docs ( #2239 )
2017-03-19 18:34:43 +00:00
e368fb4b29
implement pytest.param
...
this allows a clear addition of parameterization parameters that carry along marks
instead of nesting multiple mark objects and destroying the possibility of creating
function valued parameters,
it just folders everything together into one object carrfying parameters, and the marks.
2017-03-17 16:53:43 +01:00
75ec893d75
Merge pull request #2297 from nicoddemus/init-files-docs
...
Attempt to clarify the confusion regarding __init__ files and unique test names
2017-03-15 10:53:09 -03:00
272aba98e2
Mention the src layout as recommended practice
2017-03-14 18:39:02 -03:00
6c9011c12f
Merge branch 'master' into merge-master-into-features-post-3.0.7
2017-03-14 18:10:23 -03:00
5056d8cbe8
Merge pull request #2304 from nicoddemus/release-3.0.7
...
Release 3.0.7
2017-03-14 18:03:44 -03:00
4a9348324d
Add more information to test-layout docs as discussed during PR
2017-03-14 07:59:01 -03:00
92b49d246e
Clarify that record_xml_property is experimental, not junitxml
...
Related to #2306
2017-03-13 23:04:44 -03:00
90c934e25e
Include release 3.0.7 announce in index.rst
2017-03-13 18:59:15 -04:00
d58780f9a6
Update regendoc
2017-03-13 18:41:20 -04:00
b1ab2ca963
Bump to version 3.0.7 and update CHANGELOG
2017-03-13 18:37:49 -04:00
1e0cf5ce4d
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
...
# Conflicts:
# AUTHORS
# CHANGELOG.rst
# _pytest/pytester.py
2017-03-10 15:54:05 -03:00
581857aab6
Fix typo
2017-03-09 20:46:22 -03:00
841f731707
Attempt to clarify the confusion regarding __init__ files and unique test names
...
Fix #529
2017-03-09 20:41:33 -03:00
e05ff0338a
assert.rst: typographical correction
2017-03-06 01:01:55 +08:00
bb5f200ed7
Improve docs for yield-fixture and with statement a bit
...
Fix #2262
2017-02-25 12:06:51 -03:00
fb0b90646e
New-style classes implemented for python 2.7 - #2147
2017-02-16 20:28:17 +01:00
8f98ac5ae8
Fix typo in docs "textures" -> "fixtures"
2017-02-15 13:15:53 -02:00
231e2f9a90
Merge pull request #2252 from nicoddemus/fixture-visibility-docs
...
Improve pytest_plugins docs
2017-02-15 15:53:30 +01:00
c4d974460c
Improve pytest_plugins docs
...
As discussed in #2246
2017-02-15 11:57:03 -02:00
91c6bef77a
Add venv to the default norecursedirs
...
venv (without a dot) is commonly used as a name for a virtualenv directory, and
we don't want to collect that.
2017-02-15 14:55:12 +01:00
b536fb7ace
Mention next training event.
2017-02-14 11:45:39 +00:00
713bdc1f9f
merge master into features
2017-01-26 12:00:52 +01:00
Bruno Oliveira
Lev Maximov
Floris Bruynooghe
Ronny Pfannschmidt
Dmitri Pribysh
David Giese
Krzysztof Szularz
Skylar Downes
Paweł Adamczak
NODA, Kai
Michal Wajszczuk
Ronny Pfannschmidt
Florian Bruhin