Merge pull request #1006 from hpk42/pytest-2.7

some fixes, streamlines to get 2.7.3 out the door

_pytest/__init__.py

@@ -1,2 +1,2 @@
 #
-__version__ = '2.7.2'
+__version__ = '2.7.3'

_pytest/runner.py

@@ -3,8 +3,6 @@ import bdb
 import sys
 from time import time
 
-from pkg_resources import parse_version
-
 import py
 import pytest
 from py._code.code import TerminalRepr
@@ -496,7 +494,14 @@ def importorskip(modname, minversion=None):
     if minversion is None:
         return mod
     verattr = getattr(mod, '__version__', None)
-    if verattr is None or parse_version(verattr) < parse_version(minversion):
-        skip("module %r has __version__ %r, required is: %r" %(
-             modname, verattr, minversion))
+    if minversion is not None:
+        try:
+            from pkg_resources import parse_version as pv
+        except ImportError:
+            skip("we have a required version for %r but can not import "
+                 "no pkg_resources to parse version strings." %(modname,))
+        if verattr is None or pv(verattr) < pv(minversion):
+            skip("module %r has __version__ %r, required is: %r" %(
+                 modname, verattr, minversion))
     return mod
+

setup.cfg

@@ -8,3 +8,7 @@ upload-dir = doc/en/build/html
 
 [bdist_wheel]
 universal = 1
+
+[devpi:upload]
+formats=sdist.tgz,bdist_wheel
+

testing/test_runner.py

@@ -293,7 +293,7 @@ class TestExecutionForked(BaseFunctionalTests):
 
     def getrunner(self):
         # XXX re-arrange this test to live in pytest-xdist
-        xplugin = pytest.importorskip("xdist.plugin")
+        xplugin = pytest.importorskip("xdist.boxed")
         return xplugin.forked_run_report
 
     def test_suicide(self, testdir):