.gitignore

@@ -59,3 +59,6 @@ target/
 
 # generated by setuptools_scm
 pluggy/_version.py
+
+# generated by pip
+pip-wheel-metadata/

.travis.yml

@@ -22,6 +22,8 @@ jobs:
       env: TOXENV=py36-pytestrelease
     - python: 'pypy'
       env: TOXENV=pypy-pytestrelease
+    - python: 'pypy3.5'
+      env: TOXENV=pypy3-pytestrelease
     - python: 'nightly'
       env: TOXENV=py37-pytestrelease
     - python: '2.7'

CHANGELOG.rst

@@ -1,3 +1,23 @@
+pluggy 0.9.0 (2019-02-21)
+=========================
+
+Features
+--------
+
+- `#189 <https://github.com/pytest-dev/pluggy/issues/189>`_: ``PluginManager.load_setuptools_entrypoints`` now accepts a ``name`` parameter that when given will
+  load only entry points with that name.
+
+  ``PluginManager.load_setuptools_entrypoints`` also now returns the number of plugins loaded by the
+  call, as opposed to the number of all plugins loaded by all calls to this method.
+
+
+
+Bug Fixes
+---------
+
+- `#187 <https://github.com/pytest-dev/pluggy/issues/187>`_: Fix internal ``varnames`` function for PyPy3.
+
+
 pluggy 0.8.1 (2018-11-09)
 =========================
 

docs/conf.py

@@ -33,19 +33,24 @@
 language = None
 
 pygments_style = "sphinx"
-html_logo = "_static/img/plug.png"
+# html_logo = "_static/img/plug.png"
 html_theme = "alabaster"
 html_theme_options = {
-    # 'logo': 'img/plug.png',
-    # 'logo_name': 'true',
-    "description": "The `pytest` plugin system",
+    "logo": "img/plug.png",
+    "description": "The pytest plugin system",
     "github_user": "pytest-dev",
     "github_repo": "pluggy",
     "github_button": "true",
     "github_banner": "true",
+    "github_type": "star",
+    "travis_button": "true",
+    "badge_branch": "master",
     "page_width": "1080px",
     "fixed_sidebar": "false",
 }
+html_sidebars = {
+    "**": ["about.html", "localtoc.html", "relations.html", "searchbox.html"]
+}
 html_static_path = ["_static"]
 
 # One entry per manual page. List of tuples

pluggy/hooks.py

@@ -2,6 +2,7 @@
 Internal hook annotation, representation and calling machinery.
 """
 import inspect
+import sys
 import warnings
 from .callers import _legacymulticall, _multicall
 
@@ -135,6 +136,9 @@ def _getargspec(func):
         return inspect.getargspec(func)
 
 
+_PYPY3 = hasattr(sys, "pypy_version_info") and sys.version_info.major == 3
+
+
 def varnames(func):
     """Return tuple of positional and keywrord argument names for a function,
     method, class or callable.
@@ -172,13 +176,14 @@ def varnames(func):
         defaults = ()
 
     # strip any implicit instance arg
+    # pypy3 uses "obj" instead of "self" for default dunder methods
+    implicit_names = ("self",) if not _PYPY3 else ("self", "obj")
     if args:
         if inspect.ismethod(func) or (
-            "." in getattr(func, "__qualname__", ()) and args[0] == "self"
+            "." in getattr(func, "__qualname__", ()) and args[0] in implicit_names
         ):
             args = args[1:]
 
-    assert "self" not in args  # best naming practises check?
     try:
         cache["_varnames"] = args, defaults
     except TypeError:

pluggy/manager.py

@@ -251,16 +251,22 @@ def check_pending(self):
                                 % (name, hookimpl.plugin),
                             )
 
-    def load_setuptools_entrypoints(self, entrypoint_name):
-        """ Load modules from querying the specified setuptools entrypoint name.
-        Return the number of loaded plugins. """
+    def load_setuptools_entrypoints(self, group, name=None):
+        """ Load modules from querying the specified setuptools ``group``.
+
+        :param str group: entry point group to load plugins
+        :param str name: if given, loads only plugins with the given ``name``.
+        :rtype: int
+        :return: return the number of loaded plugins by this call.
+        """
         from pkg_resources import (
             iter_entry_points,
             DistributionNotFound,
             VersionConflict,
         )
 
-        for ep in iter_entry_points(entrypoint_name):
+        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
@@ -275,7 +281,8 @@ def load_setuptools_entrypoints(self, entrypoint_name):
                 )
             self.register(plugin, name=ep.name)
             self._plugin_distinfo.append((plugin, ep.dist))
-        return len(self._plugin_distinfo)
+            count += 1
+        return count
 
     def list_plugin_distinfo(self):
         """ return list of distinfo/plugin tuples for all setuptools registered

testing/test_pluginmanager.py

@@ -449,8 +449,8 @@ def example_hook():
 def test_load_setuptools_instantiation(monkeypatch, pm):
     pkg_resources = pytest.importorskip("pkg_resources")
 
-    def my_iter(name):
-        assert name == "hello"
+    def my_iter(group, name=None):
+        assert group == "hello"
 
         class EntryPoint(object):
             name = "myname"
@@ -470,14 +470,16 @@ class PseudoPlugin(object):
     plugin = pm.get_plugin("myname")
     assert plugin.x == 42
     assert pm.list_plugin_distinfo() == [(plugin, None)]
+    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(name):
-        assert name == "hello"
+    def my_iter(group, name=None):
+        assert group == "hello"
 
         class EntryPoint(object):
             name = "myname"

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist=linting,docs,py{27,34,35,36,py}-pytestrelease,py{27,36}-pytest{master,features}
+envlist=linting,docs,py{27,34,35,36,py,py3}-pytestrelease,py{27,36}-pytest{master,features}
 
 [testenv]
 commands=pytest {posargs:testing/}