Release 0.7.1

CHANGELOG.rst

@@ -1,4 +1,4 @@
-Pluggy 0.7.0 (2018-07-26)
+pluggy 0.7.1 (2018-07-28)
 =========================
 
 Deprecations and Removals
@@ -27,6 +27,8 @@ Bug Fixes
 - `#110 <https://github.com/pytest-dev/pluggy/issues/110>`_: Fix a bug where ``_HookCaller.call_historic()`` would call the ``proc``
   arg even when the default is ``None`` resulting in a ``TypeError``.
 
+- `#160 <https://github.com/pytest-dev/pluggy/issues/160>`_: Fix problem when handling ``VersionConflict`` errors when loading setuptools plugins.
+
 
 
 Improved Documentation
@@ -62,6 +64,11 @@ Trivial/Internal Changes
 - `#66 <https://github.com/pytest-dev/pluggy/issues/66>`_: Start using ``towncrier`` and a custom ``tox`` environment to prepare releases!
 
 
+pluggy 0.7.0 (Unreleased)
+=========================
+
+* `#160 <https://github.com/pytest-dev/pluggy/issues/160>`_: We discovered a deployment issue so this version was never released to PyPI, only the tag exists.
+
 0.6.0
 -----
 - Add CI testing for the features, release, and master

pluggy/manager.py

@@ -255,7 +255,8 @@ def load_setuptools_entrypoints(self, entrypoint_name):
                 continue
             except VersionConflict as e:
                 raise PluginValidationError(
-                    "Plugin %r could not be loaded: %s!" % (ep.name, e))
+                    plugin=None,
+                    message="Plugin %r could not be loaded: %s!" % (ep.name, e))
             self.register(plugin, name=ep.name)
             self._plugin_distinfo.append((plugin, ep.dist))
         return len(self._plugin_distinfo)

testing/test_pluginmanager.py

@@ -427,6 +427,28 @@ class PseudoPlugin(object):
     assert pm.list_plugin_distinfo() == [(plugin, None)]
 
 
+def test_load_setuptools_version_conflict(monkeypatch, pm):
+    """Check that we properly handle a VersionConflict problem when loading entry points"""
+    pkg_resources = pytest.importorskip("pkg_resources")
+
+    def my_iter(name):
+        assert name == "hello"
+
+        class EntryPoint(object):
+            name = "myname"
+            dist = None
+
+            def load(self):
+                raise pkg_resources.VersionConflict('Some conflict')
+
+        return iter([EntryPoint()])
+
+    monkeypatch.setattr(pkg_resources, 'iter_entry_points', my_iter)
+    with pytest.raises(PluginValidationError,
+                       match="Plugin 'myname' could not be loaded: Some conflict!"):
+        pm.load_setuptools_entrypoints("hello")
+
+
 def test_load_setuptools_not_installed(monkeypatch, pm):
     monkeypatch.setitem(
         sys.modules, 'pkg_resources',