Skip to content
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

Support prerelease in version #38

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Support prerelease in version #38

Show file tree
Hide file tree
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
60 changes: 49 additions & 11 deletions src/juliapkg/compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,26 @@

from semver import Version

_re_partial_version = re.compile(r"^([0-9]+)(?:\.([0-9]+)(?:\.([0-9]+))?)?$")
_re_digits_g = "[0-9]+"


def _re_group(inner="", numeric=True, delimiter="."):
capture = _re_digits_g if numeric else ".*"
return f"(?:{delimiter}({capture}){inner})?"


_re_prerelease = _re_group(numeric=False)
_re_optional = _re_group(_re_group(_re_prerelease))
_re_partial_version = re.compile(rf"^({_re_digits_g}){_re_optional}$")


def _parse_partial_version(x):
m = _re_partial_version.match(x)
if m is None:
return None, None
major, minor, patch = m.groups()
v = Version(major, minor or 0, patch or 0)
n = 1 if minor is None else 2 if patch is None else 3
major, minor, patch, prerelease = m.groups()
v = Version(major, minor or 0, patch or 0, prerelease)
n = 1 if minor is None else 2 if patch is None else 3 if prerelease is None else 4
return (v, n)


Expand Down Expand Up @@ -87,20 +97,26 @@ def caret(cls, v, n):
v.major,
v.minor if n >= 2 else 0,
v.patch if n >= 3 else 0,
v.prerelease if n >= 4 else None,
)
hi = (
v.bump_major()
if v.major != 0 or n < 2
else v.bump_minor()
if v.minor != 0 or n < 3
else v.bump_patch()
if v.patch != 0 or n < 4
else v.bump_prerelease()
)
return Range(lo, hi)

@classmethod
def equality(cls, v):
lo = v
hi = v.bump_patch()
if lo.prerelease is not None:
hi = v.bump_prerelease()
else:
hi = v.bump_patch()
return Range(lo, hi)

@classmethod
Expand All @@ -120,7 +136,7 @@ def parse(cls, x):
elif x.startswith("="):
# equality specifier
v, n = _parse_partial_version(x[1:])
if v is not None and n == 3:
if v is not None and n >= 3:
return cls.equality(v)
elif " - " in x:
# range specifier
Expand All @@ -140,26 +156,40 @@ def __str__(self):
lo = self.lo
hi = self.hi
if self == Range.equality(lo):
return f"={lo.major}.{lo.minor}.{lo.patch}"
prerelease = f"-{lo.prerelease}" if lo.prerelease else ""
return f"={lo.major}.{lo.minor}.{lo.patch}{prerelease}"
if self == Range.caret(lo, 1):
return f"^{lo.major}"
if self == Range.caret(lo, 2):
return f"^{lo.major}.{lo.minor}"
if self == Range.caret(lo, 3):
return f"^{lo.major}.{lo.minor}.{lo.patch}"
if self == Range.caret(lo, 4):
return f"^{lo.major}.{lo.minor}.{lo.patch}-{lo.prerelease}"
if self == Range.tilde(lo, 1):
return f"~{lo.major}"
if self == Range.tilde(lo, 2):
return f"~{lo.major}.{lo.minor}"
if self == Range.tilde(lo, 3):
return f"~{lo.major}.{lo.minor}.{lo.patch}"
lostr = f"{lo.major}.{lo.minor}.{lo.patch}"
if self == Range.tilde(lo, 4):
return f"~{lo.major}.{lo.minor}.{lo.patch}-{lo.prerelease}"
if lo.prerelease is None:
lostr = f"{lo.major}.{lo.minor}.{lo.patch}"
else:
lostr = f"{lo.major}.{lo.minor}.{lo.patch}-{lo.prerelease}"
hi_str = ""
if hi.major > 0 and hi.minor == 0 and hi.patch == 0:
return f"{lostr} - {hi.major-1}"
hi_str += f"{hi.major}"
if hi.minor > 0 and hi.patch == 0:
return f"{lostr} - {hi.major}.{hi.minor-1}"
if hi.patch > 0:
return f"{lostr} - {hi.major}.{hi.minor}.{hi.patch-1}"
return f"{lostr} - {hi_str}.{hi.minor-1}"
hi_str += f".{hi.minor}"
if hi.patch > 0 and hi.prerelease is None:
return f"{lostr} - {hi_str}.{hi.patch-1}"
hi_str += f".{hi.patch}"
if hi.prerelease is not None:
return f"{lostr} - {hi_str}-{self._decrease_string(hi.prerelease)}"
raise ValueError("invalid range")

def __repr__(self):
Expand All @@ -180,3 +210,11 @@ def __eq__(self, other):

def is_empty(self):
return not (self.lo < self.hi)

def _decrease_string(self, string):
match = Version._LAST_NUMBER.search(string)
if match:
prev_ = str(int(match.group(1)) - 1)
start, end = match.span(1)
string = string[: max(end - len(prev_), start)] + prev_ + string[end:]
return string
6 changes: 6 additions & 0 deletions test/test_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import pytest

from juliapkg.compat import Compat, Range, Version

v = Version.parse
Expand Down Expand Up @@ -34,6 +35,7 @@ class TestRange:
("~0", Range(v("0.0.0"), v("1.0.0"))),
# equality
("=1.2.3", Range(v("1.2.3"), v("1.2.4"))),
("=1.2.3-rc4", Range(v("1.2.3-rc4"), v("1.2.3-rc5"))),
# hyphen
("1.2.3 - 4.5.6", Range(v("1.2.3"), v("4.5.7"))),
("0.2.3 - 4.5.6", Range(v("0.2.3"), v("4.5.7"))),
Expand Down Expand Up @@ -64,6 +66,7 @@ def test_parse(self, input, expected_output):
[
(Range(v("0.0.3"), v("0.0.4")), "=0.0.3"),
(Range(v("1.2.3"), v("1.2.4")), "=1.2.3"),
(Range(v("1.2.3-rc4"), v("1.2.3-rc5")), "=1.2.3-rc4"),
(Range(v("1.2.3"), v("2.0.0")), "^1.2.3"),
(Range(v("1.2.0"), v("2.0.0")), "^1.2"),
(Range(v("1.0.0"), v("2.0.0")), "^1"),
Expand Down Expand Up @@ -163,6 +166,7 @@ class TestCompat:
[
("", Compat([])),
("1.2.3", Compat([Range(v("1.2.3"), v("2.0.0"))])),
("1.2.3-rc4", Compat([Range(v("1.2.3-rc4"), v("2.0.0"))])),
(
"1, 2.3, 4.5.6",
Compat(
Expand All @@ -184,6 +188,8 @@ def test_parse(self, input, expected_output):
[
(Compat([]), ""),
(Compat([Range(v("1.2.3"), v("2.0.0"))]), "^1.2.3"),
(Compat([Range(v("1.2.3-rc4"), v("2.0.0"))]), "^1.2.3-rc4"),
(Compat([Range(v("1.2.2"), v("1.2.3-rc4"))]), "1.2.2 - 1.2.3-rc3"),
(
Compat(
[
Expand Down
Loading