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

Merge pull request #4379 from hoylemd/improve_minversion_again 

Use packaging/pkg_resources to check minversion
This commit is contained in:
Ronny Pfannschmidt 2018-11-19 21:38:45 +01:00 committed by GitHub
parent a281d6620b 1568e38997
commit 45c33c4e05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -158,6 +158,7 @@ Michael Droettboom
Michael Seifert Michael Seifert
Michal Wajszczuk Michal Wajszczuk
Mihai Capotă Mihai Capotă
Mike Hoyle (hoylemd)
Mike Lundy Mike Lundy
Miro Hrončok Miro Hrončok
Nathaniel Waisbrot Nathaniel Waisbrot

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

@ -0,0 +1 @@
Use ``pkg_resources.parse_version`` instead of ``LooseVersion`` in minversion check.

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

@ -11,10 +11,10 @@ import shlex
import sys import sys
import types import types
import warnings import warnings
from distutils.version import LooseVersion
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
@ -822,7 +822,7 @@ class Config(object):
minver = self.inicfg.get("minversion", None) minver = self.inicfg.get("minversion", None)
if minver: if minver:
if LooseVersion(minver) > LooseVersion(pytest.__version__): if parse_version(minver) > parse_version(pytest.__version__):
raise pytest.UsageError( raise pytest.UsageError(
"%s:%d: requires pytest-%s, actual pytest-%s'" "%s:%d: requires pytest-%s, actual pytest-%s'"
% ( % (