anonfunc/alhp
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

replace semver with packaging.version

Browse Source
This commit is contained in:
Giovanni Harting
2020-08-13 19:50:07 +02:00
parent 10c11139d3
commit bcfc91084a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
master.py
View File

@@ -9,8 +9,8 @@ import subprocess
import sys import sys
import time import time
from queue import Queue, Empty from queue import Queue, Empty
from packaging import version
import semver
import yaml import yaml
regex_pkgver = re.compile(r"^pkgrel\s*=\s*(.+)$", re.MULTILINE) regex_pkgver = re.compile(r"^pkgrel\s*=\s*(.+)$", re.MULTILINE)
@@ -194,13 +194,13 @@ def parse_pkgbuild(pkgbuild_file):
if not pkgver or not pkgrel: if not pkgver or not pkgrel:
logging.warning("[%s] Failed to parse pkgbuild", pkgbuild_file.split("/")[-4]) logging.warning("[%s] Failed to parse pkgbuild", pkgbuild_file.split("/")[-4])
return semver.VersionInfo.parse("{}.{}".format(pkgver, pkgrel)) return version.parse("{}-{}".format(pkgver, pkgrel))
def parse_repo(name, repo): def parse_repo(name, repo):
ver_split = find_all_files_for_pkg(name, repo)[0].split("-") ver_split = find_all_files_for_pkg(name, repo)[0].split("-")
return semver.VersionInfo.parse(ver_split[-3] + "." + ver_split[-2]) return version.parse(ver_split[-3] + "-" + ver_split[-2])
def sync_marchs_with_config(): def sync_marchs_with_config():