File tree Expand file tree Collapse file tree 2 files changed +15
-4
lines changed
Expand file tree Collapse file tree 2 files changed +15
-4
lines changed Original file line number Diff line number Diff line change 11import json
22import os
3+ import requests
4+ from packaging .version import Version
35
46import pytest
5- import requests
67
78API_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 :]
Original file line number Diff line number Diff line change 11pytest
22requests
3+ packaging
You can’t perform that action at this time.
0 commit comments