elizabeth e67d66a5d4 Merge branch 'pytest-dev' ...

# Conflicts:
#	AUTHORS

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

..

assertion

- refine lsof checking

2015-04-28 11:54:46 +02:00

costlysetup

rename pytest.factory usages into pytest.fixture ones

2012-10-05 10:21:35 +02:00

layout1

added "docs/en" directory and moved

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

nonpython

fix issue307 - use yaml.safe_load instead of yaml.load, thanks Mark Eichin.

2013-05-16 09:59:48 +02:00

py2py3

added "docs/en" directory and moved

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

attic.rst

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

index.rst

Updated documentation from txt to rst

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

markers.rst

Updated documentation from txt to rst

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

multipython.py

bump verrsion to python2.7, fix a too precise test for windows, regen docs

2015-03-26 09:34:10 +01:00

nonpython.rst

Updated documentation from txt to rst

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

parametrize.rst

Merge branch 'pytest-dev'

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

pythoncollection.py

add changelog entry for anthon's hynek-fication of options,

2013-08-01 17:32:19 +02:00

pythoncollection.rst

Updated documentation from txt to rst

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

reportingdemo.rst

Updated documentation from txt to rst

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

simple.rst

Change cx_freeze example to not use regendoc

2015-08-08 19:17:50 -03:00

special.rst

Updated documentation from txt to rst

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

xfail_demo.py

finalize pytest-2.6.1 release, regen docs

2014-08-07 21:41:51 +02:00