Bruno Oliveira 1e0cf5ce4d Merge remote-tracking branch 'upstream/master' into merge-master-into-features ...

# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/pytester.py

2017-03-10 15:54:05 -03:00

..

_code

fixed internal error on unprintable raised AssertionErrors

2017-03-04 10:26:46 +02:00

assertion

Merge remote-tracking branch 'upstream/master' into merge-master-into-features

2017-03-10 15:54:05 -03:00

vendored_packages

Revert subclassing explicitly from object introduced by accident in #2260

2017-02-18 10:34:41 -02:00

__init__.py

bump version to next dev

2017-01-22 22:21:08 +01:00

_argcomplete.py

Refactored old style classes to new style classes

2017-01-08 22:52:42 -06:00

_pluggy.py

Create _pytest.vendored_packages and _pytest._pluggy

2015-09-07 13:01:54 -03:00

cacheprovider.py

Merge remote-tracking branch 'upstream/master' into merge-master-into-features

2017-03-10 15:54:05 -03:00

capture.py

Make capsys more like stdio streams in python3. Resolves #1407.

2017-02-23 17:46:27 -08:00

compat.py

Make capsys more like stdio streams in python3. Resolves #1407.

2017-02-23 17:46:27 -08:00

config.py

Merge remote-tracking branch 'upstream/master' into merge-master-into-features

2017-03-10 15:54:05 -03:00

debugging.py

Refactored old style classes to new style classes

2017-01-08 22:52:42 -06:00

deprecated.py

Merge pull request #1813 from nicoddemus/pytest-setup.cfg

2016-08-17 20:33:57 +02:00

doctest.py

Changed the doctest_encoding option to an ini option.

2016-11-30 11:43:33 +01:00

fixtures.py

Merge remote-tracking branch 'upstream/master' into merge-master-into-features

2017-03-10 15:54:05 -03:00

freeze_support.py

Move the freezing function from genscript.py to a new module freeze_support.py

2016-06-26 19:37:24 +02:00

helpconfig.py

Add warning for incorrect passing args to -o.

2016-12-01 13:20:42 +01:00

hookspec.py

Merge remote-tracking branch 'upstream/master' into merge-master-into-features

2017-03-10 15:54:05 -03:00

impl

- enhance ordering of tests using parametrized resources

2012-08-01 09:07:32 +02:00

junitxml.py

Merge remote-tracking branch 'upstream/master' into merge-master-into-features

2017-03-10 15:54:05 -03:00

main.py

Merge remote-tracking branch 'upstream/master' into merge-master-into-features

2017-03-10 15:54:05 -03:00

mark.py

Merge remote-tracking branch 'upstream/master' into merge-master-into-features

2017-03-10 15:54:05 -03:00

monkeypatch.py

merge master into features

2017-01-26 12:00:52 +01:00

nose.py

adapt to pluggy naming, rename pytest.hookspec_opts to pytest.hookspec,s ame with hookimpl_opts

2015-05-06 10:08:08 +02:00

pastebin.py

Fix flake8 E305 and E306 errors

2016-11-20 18:59:15 -02:00

pytester.py

Merge remote-tracking branch 'upstream/master' into merge-master-into-features

2017-03-10 15:54:05 -03:00

python.py

Merge remote-tracking branch 'upstream/master' into merge-master-into-features

2017-03-10 15:54:05 -03:00

recwarn.py

Simplify condition

2017-01-03 10:57:19 -02:00

resultlog.py

Deprecate --resultlog cmdline option

2016-08-16 21:40:34 -03:00

runner.py

Refactored old style classes to new style classes

2017-01-08 22:52:42 -06:00

setuponly.py

minor: fix grammar with help for --setup-{only,show}

2016-11-28 21:33:15 +01:00

setupplan.py

Fix PEP-8.

2016-07-03 22:33:21 +02:00

skipping.py

Merge remote-tracking branch 'upstream/master' into merge-master-into-features

2017-03-10 15:54:05 -03:00

terminal.py

Merge remote-tracking branch 'upstream/master' into merge-master-into-features

2017-03-10 15:54:05 -03:00

tmpdir.py

Merge remote-tracking branch 'upstream/master' into merge-master-into-features

2017-03-10 15:54:05 -03:00

unittest.py

Spelling fixes

2017-02-15 17:00:58 +02:00