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

CHANGELOG

@@ -1,4 +1,4 @@
-1.12.dev
+1.12
 -------------------------
 
 - fix issue594: properly report errors when the test collection

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name="pytest-xdist",
-    version='1.11',
+    version='1.12',
     description='py.test xdist plugin for distributed testing and loop-on-failing modes',
     long_description=open('README.txt').read(),
     license='MIT',

testing/test_slavemanage.py

@@ -2,13 +2,15 @@ import py
 import pytest
 import execnet
 from _pytest.pytester import HookRecorder
-from xdist import slavemanage
+from xdist import slavemanage, newhooks
 from xdist.slavemanage import HostRSync, NodeManager
 
-pytest_plugins = "pytester",
+pytest_plugins = "pytester"
 
 def pytest_funcarg__hookrecorder(request, config):
     hookrecorder = HookRecorder(config.pluginmanager)
+    if hasattr(hookrecorder, "start_recording"):
+        hookrecorder.start_recording(newhooks)
     request.addfinalizer(hookrecorder.finish_recording)
     return hookrecorder
 

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist=py26,py33,py34,py27,py27-pexpect,py33-pexpect,py26,py26-old,py33-old,flakes
+envlist=py26,py33,py34,py27,py27-pexpect,py33-pexpect,py26-old,py33-old,flakes
 
 [testenv]
 changedir=testing

xdist/__init__.py

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

xdist/plugin.py

@@ -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