Skip to content

Commit fe0ac95

Browse files
committed
fix environment check
1 parent 10b8805 commit fe0ac95

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

tests/verify_environment.py

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import os
22
import sys
3-
import django
3+
from django import VERSION
4+
from packaging.version import parse as parse_version
45

56

67
def test():
@@ -10,17 +11,14 @@ def test():
1011
expected_python = os.environ["TEST_PYTHON_VERSION"]
1112
expected_django = os.environ["TEST_DJANGO_VERSION"]
1213

13-
expected_python = tuple(int(v) for v in expected_python.split(".") if v)
14-
assert sys.version_info[: len(expected_python)] == expected_python, (
15-
f"Python Version Mismatch: {sys.version_info[: len(expected_python)]} != "
16-
f"{expected_python}"
14+
expected_python = parse_version(expected_python)
15+
assert sys.version_info[:2] == (expected_python.major, expected_python.minor), (
16+
f"Python Version Mismatch: {sys.version_info[:2]} != {expected_python}"
1717
)
1818

19-
try:
20-
expected_django = tuple(int(v) for v in expected_django.split(".") if v)
21-
assert django.VERSION[: len(expected_django)] == expected_django, (
22-
f"Django Version Mismatch: {django.VERSION[: len(expected_django)]} != "
23-
f"{expected_django}"
24-
)
25-
except ValueError:
26-
assert expected_django == django.__version__
19+
dj_actual = VERSION[:2]
20+
expected_django = parse_version(expected_django)
21+
dj_expected = (expected_django.major, expected_django.minor)
22+
assert dj_actual == dj_expected, (
23+
f"Django Version Mismatch: {dj_actual} != {expected_django}"
24+
)

0 commit comments

Comments
 (0)