From 66e3cb2383ce60793559453ad3243f70d38d94a1 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Wed, 25 Nov 2009 18:08:57 +0100 Subject: * move pytest_coverage/nose_plugin to become directly importable * fixing order of coverage options * pytest: only do coverage-processing if cover-action is defined --HG-- rename : coverage/test_plugins/nose_coverage.py => coverage/nose_coverage.py rename : coverage/test_plugins/pytest_coverage.py => coverage/pytest_coverage.py --- setup.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 4a5aba1c..7ad92f3e 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,10 @@ if sys.hexversion < 0x03000000: entry_points = { 'console_scripts': [ 'coverage = coverage:main', - ] + ], + 'pytest11': [ + 'coverage = coverage.pytest_coverage', + ], }, # We need to get HTML assets from our htmlfiles dir. -- cgit v1.2.1 From b61370af5615d8aa781f1d311fe408e9a036b6da Mon Sep 17 00:00:00 2001 From: holger krekel Date: Wed, 25 Nov 2009 18:56:24 +0100 Subject: merging/unifying test plugin code * coverage/testplugin.py contains common test plugin options and pytest hooks (which don't induce "import py") * coverage/nose_coverage.py contains a basic Nose Plugin * test/test_testplugin.py contains a pytest-functional test and a nose-skeleton one. skipped as appropriate. --HG-- rename : coverage/runner.py => coverage/testplugin.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 7ad92f3e..38678d15 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ if sys.hexversion < 0x03000000: 'coverage = coverage:main', ], 'pytest11': [ - 'coverage = coverage.pytest_coverage', + 'coverage = coverage.testplugin', ], }, -- cgit v1.2.1 From 72231c6c356253323c4e18d4441401b272997c32 Mon Sep 17 00:00:00 2001 From: David Stanek Date: Sat, 20 Feb 2010 18:36:25 -0500 Subject: fixed busted nose integration --- setup.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 38678d15..37f9681c 100644 --- a/setup.py +++ b/setup.py @@ -45,6 +45,9 @@ if sys.hexversion < 0x03000000: 'pytest11': [ 'coverage = coverage.testplugin', ], + 'nose.plugins.0.10': [ + 'coverage = coverage.nose_coverage:Coverage', + ], }, # We need to get HTML assets from our htmlfiles dir. -- cgit v1.2.1 From 7ccdc87d3e4ad3a7933c3fc34e37213f36f3229a Mon Sep 17 00:00:00 2001 From: David Stanek Date: Sat, 20 Feb 2010 19:36:21 -0500 Subject: moved the nose plugin to a better name --HG-- rename : coverage/nose_coverage.py => coverage/noseplugin.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 37f9681c..6a607d43 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ if sys.hexversion < 0x03000000: 'coverage = coverage.testplugin', ], 'nose.plugins.0.10': [ - 'coverage = coverage.nose_coverage:Coverage', + 'coverage = coverage.noseplugin:Coverage', ], }, -- cgit v1.2.1