Bruno Oliveira 93b74d28d2 Merge remote-tracking branch 'upstream/master' into mm ...

Conflicts:
 * 	src/_pytest/_code/code.py
 * 	src/_pytest/main.py
 * 	testing/python/metafunc.py
 * 	testing/test_parseopt.py
 * 	testing/test_pytester.py

2020-01-22 11:03:45 -03:00

..

assertion

remove %s formatting from docs

2019-08-12 00:09:53 -06:00

costlysetup

Implemented the dynamic scope feature.

2019-08-31 18:12:24 +02:00

fixtures

Add autouse fixture order information (#3404).

2019-07-13 11:43:47 +02:00

nonpython

update doc examples **untested**

2019-11-23 21:54:11 +01:00

attic.rst

ran pyupgrade-docs

2019-08-06 12:40:27 -07:00

conftest.py

pre-commit run fix-encoding-pragma --all-files

2019-06-03 12:08:01 -03:00

index.rst

Clarify PYTHONPATH changes and `rootdir` roles

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

markers.rst

Update doc/en/example/markers.rst

2019-12-05 16:59:08 +01:00

multipython.py

remove %s formatting from docs

2019-08-12 00:09:53 -06:00

nonpython.rst

Preparing release version 5.1.2

2019-08-30 12:43:47 -03:00

parametrize.rst

Preparing release version 5.3.4

2020-01-20 13:53:31 -03:00

pythoncollection.py

pre-commit run pyupgrade --all-files

2019-06-03 12:08:02 -03:00

pythoncollection.rst

Preparing release version 5.1.2

2019-08-30 12:43:47 -03:00

reportingdemo.rst

Preparing release version 5.3.4

2020-01-20 13:53:31 -03:00

simple.rst

Preparing release version 5.3.4

2020-01-20 13:53:31 -03:00

special.rst

Preparing release version 5.1.3

2019-09-18 10:11:59 -03:00

xfail_demo.py

pre-commit run fix-encoding-pragma --all-files

2019-06-03 12:08:01 -03:00