.gitignore

@@ -58,7 +58,7 @@ target/
 *.swp
 
 # generated by setuptools_scm
-pluggy/_version.py
+src/pluggy/_version.py
 
 # generated by pip
 pip-wheel-metadata/

.travis.yml

@@ -30,6 +30,8 @@ jobs:
       env: TOXENV=pypy3-pytestrelease-coverage
     - python: '3.7'
       env: TOXENV=py37-pytestrelease-coverage
+    - python: '3.8-dev'
+      env: TOXENV=py38-pytestrelease-coverage
     - python: '2.7'
       env: TOXENV=py27-pytestmaster-coverage
     - python: '2.7'
@@ -58,8 +60,8 @@ jobs:
           repo: pytest-dev/pluggy
 
 install:
-  - pip install -U setuptools pip
-  - pip install -U tox
+  - pip install -U pip
+  - pip install -U --force-reinstall setuptools tox
 
 script:
   - tox

CHANGELOG.rst

@@ -4,6 +4,15 @@ Changelog
 
 .. towncrier release notes start
 
+pluggy 0.12.0 (2019-05-27)
+==========================
+
+Features
+--------
+
+- `#215 <https://github.com/pytest-dev/pluggy/issues/215>`_: Switch from ``pkg_resources`` to ``importlib-metadata`` for entrypoint detection for improved performance and import time.  This time with ``.egg`` support.
+
+
 pluggy 0.11.0 (2019-05-07)
 ==========================
 

appveyor.yml

@@ -26,7 +26,8 @@ install:
   - echo PyPy installed
   - pypy --version
 
-  - C:\Python35\python -m pip install tox
+  - C:\Python35\python -m pip install -U pip
+  - C:\Python35\python -m pip install -U --force-reinstall setuptools tox
 
 build: false  # Not a C# project, build stuff at the test step instead.
 

docs/conf.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-import pkg_resources
+import importlib_metadata
 
 
 extensions = [
@@ -20,14 +20,13 @@
 
 # General information about the project.
 
-dist = pkg_resources.get_distribution("pluggy")
-project = dist.project_name
+project = "pluggy"
 copyright = u"2016, Holger Krekel"
 author = "Holger Krekel"
 
-release = dist.version
+release = importlib_metadata.version(project)
 # The short X.Y version.
-version = u".".join(dist.version.split(".")[:2])
+version = u".".join(release.split(".")[:2])
 
 
 language = None

pyproject.toml

@@ -7,7 +7,7 @@ requires = [
 
 [tool.towncrier]
 package = "pluggy"
-package_dir = "pluggy"
+package_dir = "src/pluggy"
 filename = "CHANGELOG.rst"
 directory = "changelog/"
 title_format = "pluggy {version} ({project_date})"

scripts/release.py

@@ -28,9 +28,9 @@ def get_upstream(repo: Repo) -> Remote:
     """Find upstream repository for pluggy on the remotes"""
     for remote in repo.remotes:
         for url in remote.urls:
-            if url.endswith("pytest-dev/pluggy.git"):
+            if url.endswith(("pytest-dev/pluggy.git", "pytest-dev/pluggy")):
                 return remote
-    raise RuntimeError("could not find tox-dev/tox.git remote")
+    raise RuntimeError("could not find pytest-dev/pluggy remote")
 
 
 def pre_release(version):

setup.py

@@ -13,7 +13,8 @@
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
 ] + [
-    ("Programming Language :: Python :: %s" % x) for x in "2 2.7 3 3.4 3.5 3.6".split()
+    ("Programming Language :: Python :: %s" % x)
+    for x in "2 2.7 3 3.4 3.5 3.6 3.7 3.8".split()
 ]
 
 with open("README.rst", "rb") as fd:
@@ -28,17 +29,19 @@ def main():
         name="pluggy",
         description="plugin and hook calling mechanisms for python",
         long_description=long_description,
-        use_scm_version={"write_to": "pluggy/_version.py"},
+        use_scm_version={"write_to": "src/pluggy/_version.py"},
         setup_requires=["setuptools-scm"],
         license="MIT license",
         platforms=["unix", "linux", "osx", "win32"],
         author="Holger Krekel",
         author_email="holger@merlinux.eu",
         url="https://github.com/pytest-dev/pluggy",
         python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
+        install_requires=["importlib-metadata>=0.12"],
         extras_require={"dev": ["pre-commit", "tox"]},
         classifiers=classifiers,
         packages=["pluggy"],
+        package_dir={"": "src"},
     )
 
 

pluggy/manager.py → src/pluggy/manager.py

@@ -3,6 +3,8 @@
 from .hooks import HookImpl, _HookRelay, _HookCaller, normalize_hookimpl_opts
 import warnings
 
+import importlib_metadata
+
 
 def _warn_for_function(warning, function):
     warnings.warn_explicit(
@@ -25,6 +27,23 @@ def __init__(self, plugin, message):
         super(Exception, self).__init__(message)
 
 
+class DistFacade(object):
+    """Emulate a pkg_resources Distribution"""
+
+    def __init__(self, dist):
+        self._dist = dist
+
+    @property
+    def project_name(self):
+        return self.metadata["name"]
+
+    def __getattr__(self, attr, default=None):
+        return getattr(self._dist, attr, default)
+
+    def __dir__(self):
+        return sorted(dir(self._dist) + ["_dist", "project_name"])
+
+
 class PluginManager(object):
     """ Core Pluginmanager class which manages registration
     of plugin objects and 1:N hook calling.
@@ -259,29 +278,21 @@ def load_setuptools_entrypoints(self, group, name=None):
         :rtype: int
         :return: return the number of loaded plugins by this call.
         """
-        from pkg_resources import (
-            iter_entry_points,
-            DistributionNotFound,
-            VersionConflict,
-        )
-
         count = 0
-        for ep in iter_entry_points(group, name=name):
-            # is the plugin registered or blocked?
-            if self.get_plugin(ep.name) or self.is_blocked(ep.name):
-                continue
-            try:
+        for dist in importlib_metadata.distributions():
+            for ep in dist.entry_points:
+                if (
+                    ep.group != group
+                    or (name is not None and ep.name != name)
+                    # already registered
+                    or self.get_plugin(ep.name)
+                    or self.is_blocked(ep.name)
+                ):
+                    continue
                 plugin = ep.load()
-            except DistributionNotFound:
-                continue
-            except VersionConflict as e:
-                raise PluginValidationError(
-                    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))
-            count += 1
+                self.register(plugin, name=ep.name)
+                self._plugin_distinfo.append((plugin, DistFacade(dist)))
+                count += 1
         return count
 
     def list_plugin_distinfo(self):

testing/test_helpers.py

@@ -1,6 +1,9 @@
 from pluggy.hooks import varnames
 from pluggy.manager import _formatdef
 
+import sys
+import pytest
+
 
 def test_varnames():
     def f(x):
@@ -47,6 +50,24 @@ class F(object):
     assert varnames(F) == ((), ())
 
 
+@pytest.mark.skipif(
+    sys.version_info < (3,), reason="Keyword only arguments are Python 3 only"
+)
+def test_varnames_keyword_only():
+    # SyntaxError on Python 2, so we exec
+    ns = {}
+    exec(
+        "def f1(x, *, y): pass\n"
+        "def f2(x, *, y=3): pass\n"
+        "def f3(x=1, *, y=3): pass\n",
+        ns,
+    )
+
+    assert varnames(ns["f1"]) == (("x",), ())
+    assert varnames(ns["f2"]) == (("x",), ())
+    assert varnames(ns["f3"]) == ((), ("x",))
+
+
 def test_formatdef():
     def function1():
         pass

testing/test_pluginmanager.py

@@ -3,7 +3,7 @@
 """
 import pytest
 import types
-import sys
+import importlib_metadata
 from pluggy import (
     PluginManager,
     PluginValidationError,
@@ -447,64 +447,40 @@ def example_hook():
 
 
 def test_load_setuptools_instantiation(monkeypatch, pm):
-    pkg_resources = pytest.importorskip("pkg_resources")
+    class EntryPoint(object):
+        name = "myname"
+        group = "hello"
+        value = "myname:foo"
 
-    def my_iter(group, name=None):
-        assert group == "hello"
+        def load(self):
+            class PseudoPlugin(object):
+                x = 42
 
-        class EntryPoint(object):
-            name = "myname"
-            dist = None
+            return PseudoPlugin()
 
-            def load(self):
-                class PseudoPlugin(object):
-                    x = 42
+    class Distribution(object):
+        entry_points = (EntryPoint(),)
 
-                return PseudoPlugin()
+    dist = Distribution()
 
-        return iter([EntryPoint()])
+    def my_distributions():
+        return (dist,)
 
-    monkeypatch.setattr(pkg_resources, "iter_entry_points", my_iter)
+    monkeypatch.setattr(importlib_metadata, "distributions", my_distributions)
     num = pm.load_setuptools_entrypoints("hello")
     assert num == 1
     plugin = pm.get_plugin("myname")
     assert plugin.x == 42
-    assert pm.list_plugin_distinfo() == [(plugin, None)]
+    ret = pm.list_plugin_distinfo()
+    # poor man's `assert ret == [(plugin, mock.ANY)]`
+    assert len(ret) == 1
+    assert len(ret[0]) == 2
+    assert ret[0][0] == plugin
+    assert ret[0][1]._dist == dist
     num = pm.load_setuptools_entrypoints("hello")
     assert num == 0  # no plugin loaded by this call
 
 
-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(group, name=None):
-        assert group == "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", types.ModuleType("pkg_resources"))
-
-    with pytest.raises(ImportError):
-        pm.load_setuptools_entrypoints("qwe")
-
-
 def test_add_tracefuncs(he_pm):
     out = []