Skip to content

Commit ba12575

Browse files
author
Tyler Goodlet
committed
Load all plugins using setuptools entry points
1 parent a4dce05 commit ba12575

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

lab/__init__.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,3 @@
66
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
77
from .provider import get_providers
88
from .model import Environment, Facts
9-
10-
# built-in plugin loading
11-
pytest_plugins = (
12-
'lab.roles',
13-
'lab.runnerctl',
14-
'lab.logwatch',
15-
'lab.log',
16-
'lab.warnreporter',
17-
'lab.network.plugin',
18-
'lab.ctl.rpc',
19-
)

setup.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,14 @@ def run_tests(self):
7373
'facts=lab.app.facts:FactsLister',
7474
],
7575
'pytest11': [
76+
'lab.roles=lab.roles',
7677
'futurize=lab.futurize',
77-
'_storage=lab.storage',
78-
'pytestlab=lab',
78+
'lab._storage=lab.storage',
79+
'lab.logwatch=lab.logwatch',
80+
'lab.log=lab.log',
81+
'lab.warnreporter=lab.warnreporter',
82+
'lab.network=lab.network.plugin',
83+
'lab.rpyc=lab.ctl.rpc',
7984
]
8085
}
8186
)

0 commit comments

Comments
 (0)