Bruno Oliveira c2864aba3d Merge branch 'master' into merge-master ...

# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/monkeypatch.py
#	_pytest/python.py

2016-07-25 19:06:29 -03:00

..

approx.py

Fix Decimal() and __ne__() errors.

2016-03-11 16:29:18 -08:00

collect.py

Merge branch 'master' into merge-master

2016-07-25 19:06:29 -03:00

fixture.py

Merge branch 'master' into merge-master

2016-07-25 19:06:29 -03:00

integration.py

Replace all usages of "pytest_funcarg__" for @pytest.fixture

2016-07-11 22:21:52 -03:00

invocation_scope.py

Add more tests for invocation scoped fixtures

2016-07-20 21:02:36 -03:00

metafunc.py

Merge branch 'master' into merge-master

2016-07-25 19:06:29 -03:00

raises.py

Fix test name typo

2016-06-20 18:44:34 +02:00

setup_only.py

Implement --setup-show cli flag

2016-07-03 22:30:51 +02:00

setup_plan.py

Improve commenting for setupplan unittest.

2016-06-25 12:21:31 +02:00

show_fixtures_per_test.py

Change format for test function locations

2016-06-12 15:58:32 +01:00