holger krekel fdd23878ec Merge latest changes from branch 'pytest-2.7' ...

Conflicts:
	_pytest/__init__.py
	doc/en/fixture.rst
	setup.cfg
	testing/test_runner.py

2015-09-16 09:26:55 +02: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

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

example

Merge branch 'pytest-dev'

2015-08-24 22:55:11 +03:00

img

Update CONTRIBUTING documentation with GitHub instructions

2015-07-16 03:07:16 +00:00

plugins_index

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

test

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

_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

apiref.rst

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

assert.rst

Converted documentation from txt to rst

2015-08-05 10:24:14 +05:30

bash-completion.rst

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

builtin.rst

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

capture.rst

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

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

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

contributing.rst

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

customize.rst

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

doctest.rst

Add docs and CHANGELOG for ALLOW_UNICODE option

2015-08-12 22:17:15 -03:00

faq.rst

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

feedback.rst

added "docs/en" directory and moved

2012-06-06 08:52:53 +09:00

fixture.rst

Merge latest changes from branch 'pytest-2.7'

2015-09-16 09:26:55 +02:00

funcarg_compare.rst

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

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

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

goodpractises.rst

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

index.rst

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

links.inc

Fix broken links

2015-07-18 14:15:07 -03:00

Makefile

Added makefile changes for docs

2015-08-04 18:44:52 +05:30

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

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

plugins.rst

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

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

Converted documentation from txt to rst

2015-08-05 10:24:14 +05:30

setup.rst

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

skipping.rst

Fix accidental inversion in skip example.

2015-08-12 07:38:04 +02:00

status.rst

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

talks.rst

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

tmpdir.rst

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

unittest.rst

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

usage.rst

Document single-method usage

2015-09-04 15:11:57 -04:00

writing_plugins.rst

Mention cookie-cutter in the docs and fix broken links to <extplugin>

2015-08-25 23:59:18 -03: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