p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4768 from horta/avoid-pkg_resources 

Avoid pkg_resources import at the top-level.
This commit is contained in:
Daniel Hahler 2019-03-05 23:02:02 +01:00 committed by GitHub
parent 2b3d69da2b 821b6ef2a6
commit 236bada755
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/4768.trivial.rst Normal file
View File

@ -0,0 +1 @@
Avoid pkg_resources import at the top-level.

2
src/_pytest/config/__init__.py
View File

@ -14,7 +14,6 @@ import warnings
import py import py
import six import six
from pkg_resources import parse_version
from pluggy import HookimplMarker from pluggy import HookimplMarker
from pluggy import HookspecMarker from pluggy import HookspecMarker
from pluggy import PluginManager from pluggy import PluginManager
@ -845,6 +844,7 @@ class Config(object):
def _checkversion(self): def _checkversion(self):
import pytest import pytest
from pkg_resources import parse_version
minver = self.inicfg.get("minversion", None) minver = self.inicfg.get("minversion", None)
if minver: if minver: