Buck Golemon eabf2f9091 Merge branch 'master' into features ... Conflicts: AUTHORS _pytest/__init__.py _pytest/hookspec.py _pytest/recwarn.py testing/test_recwarn.py		2015-12-07 14:28:59 -08:00
..
_templates	Update sidebar links from Bitbucket to GitHub	2015-07-16 03:08:06 +00:00
_themes	refine release process according to Bruno's feedback	2015-03-27 09:27:31 +01:00
announce	correct copy&paste error in the release announcement version number	2015-12-06 17:44:08 +01:00
example	doc regen for release 2.8.4	2015-12-06 16:14:23 +01:00
img	Update CONTRIBUTING documentation with GitHub instructions	2015-07-16 03:07:16 +00:00
plugins_index	Update plugins_index.rst	2015-10-17 13:37:38 -03:00
test	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
Makefile	fix documentation gegeneration, kill Makefile	2015-09-22 14:22:37 +02:00
_getdoctarget.py	Fix getdoctarget to ignore comment lines	2015-08-23 11:20:34 -03:00
adopt.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
assert.rst	doc regen for release 2.8.4	2015-12-06 16:14:23 +01:00
bash-completion.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
builtin.rst	doc regen for release 2.8.4	2015-12-06 16:14:23 +01:00
cache.rst	doc regen for release 2.8.4	2015-12-06 16:14:23 +01:00
capture.rst	doc regen for release 2.8.4	2015-12-06 16:14:23 +01:00
changelog.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
check_sphinx.py	added "docs/en" directory and moved	2012-06-06 08:52:53 +09:00
conf.py	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
conftest.py	added "docs/en" directory and moved	2012-06-06 08:52:53 +09:00
contact.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
contents.rst	Fix contents.rst.	2015-10-07 18:10:13 +02:00
contributing.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
customize.rst	Improve description on how pytest starts test collection in goodpractises	2015-12-03 01:01:34 -02:00
doctest.rst	doc regen for release 2.8.4	2015-12-06 16:14:23 +01:00
faq.rst	Replace "--assertmode=off" by "--assert=plain"	2015-12-02 18:39:32 -02:00
feedback.rst	added "docs/en" directory and moved	2012-06-06 08:52:53 +09:00
fixture.rst	doc regen for release 2.8.4	2015-12-06 16:14:23 +01:00
funcarg_compare.rst	Fixed docs	2015-11-27 22:46:45 -08:00
funcargs.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
genapi.py	many doc improvements and fixes	2012-10-18 12:24:50 +02:00
getting-started.rst	doc regen for release 2.8.4	2015-12-06 16:14:23 +01:00
goodpractises.rst	Improve description on how pytest starts test collection in goodpractises	2015-12-03 01:01:34 -02:00
index.rst	Various Python 3.5 documentation mentions	2015-09-17 07:32:52 -04:00
links.inc	Fix broken links	2015-07-18 14:15:07 -03:00
mark.rst	Add note that using marks on fixtures is not supported	2015-08-27 20:11:18 -03:00
monkeypatch.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
naming20.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
nose.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
overview.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
parametrize.rst	doc regen for release 2.8.4	2015-12-06 16:14:23 +01:00
plugins.rst	Merge pull request #1058 from nicoddemus/doc-how-disable-cache	2015-10-01 13:06:02 +02:00
projects.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
pytest.ini	added "docs/en" directory and moved	2012-06-06 08:52:53 +09:00
recwarn.rst	Merge branch 'master' into features	2015-12-07 14:28:59 -08:00
setup.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
skipping.rst	Merge branch 'master' into features	2015-12-07 14:28:59 -08:00
status.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
talks.rst	Add 'Improve your testing with Pytest and Mock' video from PyCon SG 2015	2015-11-11 11:28:59 +08:00
tmpdir.rst	doc regen for release 2.8.4	2015-12-06 16:14:23 +01:00
unittest.rst	doc regen for release 2.8.4	2015-12-06 16:14:23 +01:00
usage.rst	Fixed docs	2015-11-27 22:46:45 -08:00
writing_plugins.rst	Update xdist link; BitBucket -> GitHub	2015-12-01 13:20:55 -05:00
xdist.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
xunit_setup.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
yieldfixture.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30