Merge pull request #4379 from hoylemd/improve_minversion_again

Use packaging/pkg_resources to check minversion
pytest-dev · Nov 19, 2018 · 45c33c4 · 45c33c4
2 parents a281d66 + 1568e38
commit 45c33c4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -158,6 +158,7 @@ Michael Droettboom
 Michael Seifert
 Michal Wajszczuk
 Mihai Capotă
+Mike Hoyle (hoylemd)
 Mike Lundy
 Miro Hrončok
 Nathaniel Waisbrot

diff --git a/changelog/4315.trivial.rst b/changelog/4315.trivial.rst
@@ -0,0 +1 @@
+Use ``pkg_resources.parse_version`` instead of ``LooseVersion`` in minversion check.
diff --git a/src/_pytest/config/__init__.py b/src/_pytest/config/__init__.py
@@ -11,10 +11,10 @@
 import sys
 import types
 import warnings
-from distutils.version import LooseVersion
 
 import py
 import six
+from pkg_resources import parse_version
 from pluggy import HookimplMarker
 from pluggy import HookspecMarker
 from pluggy import PluginManager
@@ -822,7 +822,7 @@ def _checkversion(self):
 
         minver = self.inicfg.get("minversion", None)
         if minver:
-            if LooseVersion(minver) > LooseVersion(pytest.__version__):
+            if parse_version(minver) > parse_version(pytest.__version__):
                 raise pytest.UsageError(
                     "%s:%d: requires pytest-%s, actual pytest-%s'"
                     % (
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Use ``pkg_resources.parse_version`` instead of ``LooseVersion`` in minversion check.