Kale Kundert 5ceee08590 Fix CHANGELOG merge conflicts.

2016-03-14 11:55:50 -07:00

..

_code

Drop assertionnew and assertionold from _pytest._code

2016-01-25 23:18:04 -02:00

assertion

fix formatting utf-8 error explanation

2016-02-12 20:28:06 +01:00

vendored_packages

Fix spelling: explicitely --> explicitly

2015-12-01 01:41:47 -08:00

__init__.py

Bump version to 2.10.0.dev1

2016-03-01 18:48:13 -03:00

_argcomplete.py

Remove code related to support python <= 2.5

2015-12-16 16:16:22 -02:00

_pluggy.py

Create _pytest.vendored_packages and _pytest._pluggy

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

cacheprovider.py

Add explicit flag names for failed first and last failed

2016-01-27 21:28:38 +00:00

capture.py

Fix trailing white-space

2015-12-25 17:51:55 -02:00

config.py

Add bool type to addini

2016-02-14 20:52:27 -02:00

doctest.py

Add a new doctest_namespace fixture

2016-03-02 12:43:57 +00:00

genscript.py

revert setuptools_scm addition introduced with f22d14b105

2015-09-17 12:58:04 +02:00

helpconfig.py

Show known environment variables in py.test --help

2015-09-28 18:34:16 -03:00

hookspec.py

Merge branch 'master' into features

2016-01-02 23:56:01 +01:00

impl

- enhance ordering of tests using parametrized resources

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

junitxml.py

junit: allow multiple properties with same name

2016-02-29 16:00:26 +01:00

main.py

Moved py.code code over to py.test

2016-01-25 23:18:04 -02:00

mark.py

Fix a typo in the docstring for mark.MarkGenerator

2016-02-27 14:15:42 +01:00

monkeypatch.py

monkeypatch: unnest handling code

2016-01-24 12:28:14 +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 pastebin when captured output contains non-ascii characters

2015-12-03 20:07:18 -02:00

pdb.py

Merge branch 'master' into 'features'

2016-01-22 18:32:45 -02:00

pytester.py

Moved py.code code over to py.test

2016-01-25 23:18:04 -02:00

python.py

Fix CHANGELOG merge conflicts.

2016-03-14 11:55:50 -07:00

recwarn.py

Moved py.code code over to py.test

2016-01-25 23:18:04 -02:00

resultlog.py

Use os.path.isdir instead of os.path.exists

2015-06-17 08:08:03 -03:00

runner.py

Moved py.code code over to py.test

2016-01-25 23:18:04 -02:00

skipping.py

Fix skip/xfail markers in parametrized arguments

2016-02-25 19:13:09 -03:00

standalonetemplate.py

setuptools not present issue deprecating gentest

2015-07-25 13:50:40 +02:00

terminal.py

Display collect progress only when in a terminal

2016-02-20 14:38:30 -02:00

tmpdir.py

Make tmpdir resiliant to user ids that do not exist

2015-09-18 21:26:19 -04:00

unittest.py

Moved py.code code over to py.test

2016-01-25 23:18:04 -02:00