Merge pull request #4308 from asottile/compare_versions_with_loose_ve…

…rsion Don't string-compare version numbers
pytest-dev · Nov 5, 2018 · 176d274 · 176d274
2 parents 832b59b + 85a3333
commit 176d274
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/changelog/4306.bugfix.rst b/changelog/4306.bugfix.rst
@@ -0,0 +1 @@
+Parse ``minversion`` as an actual version and not as dot-separated strings.
diff --git a/src/_pytest/config/__init__.py b/src/_pytest/config/__init__.py
@@ -11,6 +11,7 @@
 import sys
 import types
 import warnings
+from distutils.version import LooseVersion
 
 import py
 import six
@@ -816,9 +817,7 @@ def _checkversion(self):
 
         minver = self.inicfg.get("minversion", None)
         if minver:
-            ver = minver.split(".")
-            myver = pytest.__version__.split(".")
-            if myver < ver:
+            if LooseVersion(minver) > LooseVersion(pytest.__version__):
                 raise pytest.UsageError(
                     "%s:%d: requires pytest-%s, actual pytest-%s'"
                     % (