Skip to content

Use SemverVersion in NginxVersionRange #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hritik14 merged 1 commit into from
Jan 14, 2022
Merged

Use SemverVersion in NginxVersionRange #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/univers/version_range.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,34 +783,34 @@ def from_native(cls, string):
if "-" in clauses:
# dash range
start, _, end = clauses.partition("-")
start_version = semantic_version.Version.coerce(start)
end_version = semantic_version.Version.coerce(end)
start_version = cls.version_class(start)
end_version = cls.version_class(end)
vstart = VersionConstraint(comparator=">=", version=start_version)
vend = VersionConstraint(comparator="<=", version=end_version)
constraints.extend([vstart, vend])

elif "+" in clauses:
# suffixed version
vs = clauses.rstrip("+")
version = semantic_version.Version.coerce(vs)
is_stable = is_even(version.minor)
version = cls.version_class(vs)
is_stable = is_even(version.value.minor)

if is_stable:
# we have a start and end in stable ranges
start_version = semantic_version.Version.coerce(vs)
end_version = start_version.next_minor()
start_version = cls.version_class(vs)
end_version = cls.version_class(str(start_version.value.next_minor()))
vstart = VersionConstraint(comparator=">=", version=start_version)
vend = VersionConstraint(comparator="<", version=end_version)
constraints.extend([vstart, vend])
else:
# mainline branch ranges are resolved to a single constraint
version = semantic_version.Version.coerce(vs)
version = cls.version_class(vs)
constraint = VersionConstraint(comparator=">=", version=version)
constraints.append(constraint)

else:
# plain single version
version = semantic_version.Version.coerce(clauses)
version = cls.version_class(clauses)
constraint = VersionConstraint(comparator="=", version=version)
constraints.append(constraint)

Expand Down