From 16a4e5793f4943d951ede877f4eef7bad274e0ab Mon Sep 17 00:00:00 2001 From: Ilya Priven Date: Tue, 13 Jun 2023 16:08:48 -0400 Subject: [PATCH 1/2] [out] version checks must be against min version or higher --- mypy/test/data.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mypy/test/data.py b/mypy/test/data.py index 86193e303d9c..0418ae8c0f27 100644 --- a/mypy/test/data.py +++ b/mypy/test/data.py @@ -17,6 +17,7 @@ import pytest +from mypy import defaults from mypy.test.config import PREFIX, test_data_prefix, test_temp_dir root_dir = os.path.normpath(PREFIX) @@ -166,6 +167,10 @@ def _item_fail(msg: str) -> NoReturn: version = tuple(int(x) for x in version_str.split(".")) except ValueError: _item_fail(f"{version_str!r} is not a valid python version") + if version < defaults.PYTHON3_VERSION_MIN: + _item_fail( + f"Version check against {version}; must be >= {defaults.PYTHON3_VERSION_MIN}" + ) if compare_op == ">=": version_check = sys.version_info >= version elif compare_op == "==": From 72e306c25b5cb43ce67fb52ea912af24b3a0707d Mon Sep 17 00:00:00 2001 From: Ilya Priven Date: Tue, 13 Jun 2023 16:43:19 -0400 Subject: [PATCH 2/2] min should be PYTHON3_VERSION --- mypy/test/data.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mypy/test/data.py b/mypy/test/data.py index 0418ae8c0f27..9b3931ee8be6 100644 --- a/mypy/test/data.py +++ b/mypy/test/data.py @@ -167,9 +167,9 @@ def _item_fail(msg: str) -> NoReturn: version = tuple(int(x) for x in version_str.split(".")) except ValueError: _item_fail(f"{version_str!r} is not a valid python version") - if version < defaults.PYTHON3_VERSION_MIN: + if version < defaults.PYTHON3_VERSION: _item_fail( - f"Version check against {version}; must be >= {defaults.PYTHON3_VERSION_MIN}" + f"Version check against {version}; must be >= {defaults.PYTHON3_VERSION}" ) if compare_op == ">=": version_check = sys.version_info >= version