Skip to content

Commit af9e213

Browse files
committed
Get versions correctly
1 parent fbb00aa commit af9e213

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

tests/conftest.py

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import json
22
import os
3+
import requests
4+
from packaging.version import Version
35

46
import pytest
5-
import requests
67

78
API_URL = (
89
"https://packages.broadcom.com/artifactory/api/storage/saltproject-generic/windows"
@@ -27,9 +28,18 @@ def target_salt_version():
2728
version = folder["uri"].strip("/")
2829
versions[version] = version
2930
# We're trying to get the latest major version and latest overall
30-
maj_version = version.split(".")[0]
31-
versions[maj_version] = version
32-
versions["latest"] = version
31+
maj_ver, _ = version.split(".")
32+
if maj_ver in versions:
33+
if Version(version) > Version(versions[maj_ver]):
34+
versions[maj_ver] = version
35+
else:
36+
versions[maj_ver] = version
37+
38+
if "latest" in versions:
39+
if Version(version) > Version(versions["latest"]):
40+
versions["latest"] = version
41+
else:
42+
versions["latest"] = version
3343

3444
if target_salt.startswith("v"):
3545
target_salt = target_salt[1:]

tests/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
pytest
22
requests
3+
packaging

0 commit comments

Comments
 (0)