finalize 1.12 version, some more adaptation for pytest versions, streamlining tox.ini

This commit is contained in:
holger krekel
2015-05-06 13:41:39 +02:00
parent faf2e0861f
commit 2ea07f73a7
6 changed files with 13 additions and 7 deletions

View File

@@ -1,2 +1,2 @@
#
__version__ = '1.11'
__version__ = '1.12'

View File

@@ -45,7 +45,11 @@ def pytest_addoption(parser):
# -------------------------------------------------------------------------
def pytest_addhooks(pluginmanager):
from xdist import newhooks
pluginmanager.addhooks(newhooks)
# avoid warnings with pytest-2.8
method = getattr(pluginmanager, "add_hookspecs", None)
if method is None:
method = pluginmanager.addhooks
method(newhooks)
# -------------------------------------------------------------------------
# distributed testing initialization