billchenchina/ognibuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix handling of custom python versions.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-04-30 19:39:17 +01:00
parent 126d06c332
commit 475a395d95
1 changed files with 10 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

27
ognibuild/resolver/apt.py
View file

@ -180,7 +180,6 @@ def python_spec_to_apt_rels(pkg_name, specs):
else: else:
rels = [] rels = []
for spec in specs: for spec in specs:
deb_version = Version(spec[1])
if spec[0] == "~=": if spec[0] == "~=":
# PEP 440: For a given release identifier V.N , the compatible # PEP 440: For a given release identifier V.N , the compatible
# release clause is approximately equivalent to the pair of # release clause is approximately equivalent to the pair of
@ -189,32 +188,26 @@ def python_spec_to_apt_rels(pkg_name, specs):
parts.pop(-1) parts.pop(-1)
parts[-1] = str(int(parts[-1]) + 1) parts[-1] = str(int(parts[-1]) + 1)
next_maj_deb_version = Version(".".join(parts)) next_maj_deb_version = Version(".".join(parts))
deb_version = Version(spec[1])
rels.extend( rels.extend(
[ [[{"name": pkg_name, "version": (">=", deb_version)}],
{"name": pkg_name, "version": (">=", deb_version)}, [{"name": pkg_name, "version": ("<<", next_maj_deb_version)}]])
{"name": pkg_name, "version": ("<<", next_maj_deb_version)},
]
)
elif spec[0] == "!=": elif spec[0] == "!=":
rels.extend( deb_version = Version(spec[1])
[ rels.extend([
{"name": pkg_name, "version": (">>", deb_version)}, [{"name": pkg_name, "version": (">>", deb_version)}],
{"name": pkg_name, "version": ("<<", deb_version)}, [{"name": pkg_name, "version": ("<<", deb_version)}]])
]
)
elif spec[1].endswith(".*") and spec[0] == "==": elif spec[1].endswith(".*") and spec[0] == "==":
s = spec[1].split(".") s = spec[1].split(".")
s.pop(-1) s.pop(-1)
n = list(s) n = list(s)
n[-1] = str(int(n[-1]) + 1) n[-1] = str(int(n[-1]) + 1)
rels.extend( rels.extend(
[ [[{"name": pkg_name, "version": (">=", Version(".".join(s)))}],
{"name": pkg_name, "version": (">=", Version(".".join(s)))}, [{"name": pkg_name, "version": ("<<", Version(".".join(n)))}]])
{"name": pkg_name, "version": ("<<", Version(".".join(n)))},
]
)
else: else:
c = {">=": ">=", "<=": "<=", "<": "<<", ">": ">>", "==": "="}[spec[0]] c = {">=": ">=", "<=": "<=", "<": "<<", ">": ">>", "==": "="}[spec[0]]
deb_version = Version(spec[1])
rels.append([{"name": pkg_name, "version": (c, deb_version)}]) rels.append([{"name": pkg_name, "version": (c, deb_version)}])
return rels return rels