diff --git a/AUTHORS b/AUTHORS index 2e487e77226..895310caa48 100644 --- a/AUTHORS +++ b/AUTHORS @@ -103,6 +103,7 @@ Punyashloka Biswal Quentin Pradet Ralf Schmitt Raphael Pierzina +Raquel Alegre Roberto Polli Romain Dorgueil Roman Bolshakov diff --git a/CHANGELOG.rst b/CHANGELOG.rst index d571a2bf3db..6c9aaaffa1a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -8,8 +8,9 @@ * Fix loader error when running ``pytest`` embedded in a zipfile. Thanks `@mbachry`_ for the PR. - -* + +* Fix pkg_resources import error in Jython projects (`#1853`). + Thanks `@raquel-ucl`_ for the PR. * diff --git a/_pytest/config.py b/_pytest/config.py index 2a121581148..8d115ea6530 100644 --- a/_pytest/config.py +++ b/_pytest/config.py @@ -5,7 +5,6 @@ import types import warnings -import pkg_resources import py # DON't import pytest here because it causes import cycle troubles import sys, os @@ -950,6 +949,7 @@ def _consider_importhook(self, args, entrypoint_name): except SystemError: mode = 'plain' else: + import pkg_resources self.pluginmanager.rewrite_hook = hook for entrypoint in pkg_resources.iter_entry_points('pytest11'): for entry in entrypoint.dist._get_metadata('RECORD'):