Bruno Oliveira ade7ad25c7 Merge remote-tracking branch 'upstream/master' into features

2018-03-05 19:48:25 -03:00

..

assertion

Fix imports in failure_demo.py

2018-01-30 19:44:06 +00:00

costlysetup

New-style classes implemented for python 2.7 - #2147

2017-02-16 20:28:17 +01:00

nonpython

Sort yml items to get same results for regendoc runs

2016-08-01 20:09:35 -04:00

py2py3

added "docs/en" directory and moved

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

attic.rst

Replace deprecated "config.option.<name>" usages from docs

2017-07-27 19:18:44 -03:00

conftest.py

added "docs/en" directory and moved

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

index.rst

Clarify PYTHONPATH changes and `rootdir` roles

2017-07-21 07:28:11 -03:00

markers.rst

Preparing release version 3.4.0

2018-01-30 19:47:56 +00:00

multipython.py

Remove code for unsupported Python versions

2017-10-10 08:54:56 +03:00

nonpython.rst

Preparing release version 3.4.0

2018-01-30 19:47:56 +00:00

parametrize.rst

Preparing release version 3.3.0

2017-11-23 20:25:36 +00:00

pythoncollection.py

New-style classes implemented for python 2.7 - #2147

2017-02-16 20:28:17 +01:00

pythoncollection.rst

Add --deselect command line option

2018-02-16 08:17:37 -06:00

reportingdemo.rst

Preparing release version 3.4.2

2018-03-04 19:37:49 +00:00

simple.rst

Merge pull request #2770 from HPENetworking/master

2018-02-22 07:38:55 +01:00

special.rst

Preparing release version 3.4.0

2018-01-30 19:47:56 +00:00

xfail_demo.py

finalize pytest-2.6.1 release, regen docs

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