don't instantiate hookimplmarker by implprefix deprecated in pytest-d…

…ev/pluggy#116 Signed-off-by: Oleg Höfling <oleg.hoefling@gmail.com>
hoefling · May 22, 2019 · 29af259 · 29af259
1 parent 696fcc7
commit 29af259
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/src/devpi_ext/login.py b/src/devpi_ext/login.py
@@ -15,7 +15,7 @@
     import ConfigParser as configparser
 import os
 
-from pluggy import HookimplMarker
+import devpi.main
 
 
 _key_repo = 'repository'
@@ -24,10 +24,7 @@
 _section_keys = (_key_repo, _key_username, _key_password)
 
 
-hookimpl = HookimplMarker('devpiclient')
-
-
-@hookimpl(tryfirst=True)
+@devpi.main.hookimpl(tryfirst=True)
 def devpiclient_get_password(url, username):
     """See :py:func:`devpi.hookspecs.devpiclient_get_password`"""
     pypirc = os.path.join(os.path.expanduser('~'), '.pypirc')

diff --git a/src/devpi_ext/login.pyi b/src/devpi_ext/login.pyi
@@ -1,7 +1,5 @@
 from typing import Optional, Text, TextIO
-from pluggy import HookimplMarker
 
-hookimpl: HookimplMarker
 
 def _find_password(fp: TextIO, url: Text, username: Text) -> Optional[Text]: ...
 def devpiclient_get_password(url: Text, username: Text) -> Optional[Text]: ...
diff --git a/tests/test_hook_registration.py b/tests/test_hook_registration.py