Merge pull request #4768 from horta/avoid-pkg_resources

Avoid pkg_resources import at the top-level.
2019-03-05 23:02:02 +01:00
parent 2b3d69da2b 821b6ef2a6
commit 236bada755
2 changed files with 2 additions and 1 deletions
@@ -0,0 +1 @@
+Avoid pkg_resources import at the top-level.
@@ -14,7 +14,6 @@ import warnings

 import py
 import six
-from pkg_resources import parse_version
 from pluggy import HookimplMarker
 from pluggy import HookspecMarker
 from pluggy import PluginManager
@@ -845,6 +844,7 @@ class Config(object):

    def _checkversion(self):
        import pytest
+        from pkg_resources import parse_version

        minver = self.inicfg.get("minversion", None)
        if minver:
				`@@ -0,0 +1 @@`
				`Avoid pkg_resources import at the top-level.`