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

Jump to bottom

Partially handle extra version for versions constraint #409

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Partially handle extra version for versions constraint #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9fe940d
test(semver): separate tilde from tilde PEP 440
mkniewallner Jun 30, 2022
98fd848
feat(semver): handle 4th part for tilde PEP 440
mkniewallner Jun 30, 2022
42e8094
feat(semver): handle 4th part for wildcard
mkniewallner Jun 30, 2022
e9abccc
Merge branch 'main' into handle-extra-version
Secrus Aug 22, 2022
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
18 changes: 13 additions & 5 deletions src/poetry/core/semver/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,14 @@ def parse_single_constraint(constraint: str) -> VersionConstraint:
m = TILDE_PEP440_CONSTRAINT.match(constraint)
if m:
version = Version.parse(m.group("version"))
if version.release.precision == 2:
precision = version.release.precision

if precision == 2:
high = version.stable.next_major()
else:
elif precision == 3:
high = version.stable.next_minor()
else:
high = version.stable.next_patch()

return VersionRange(version, high, include_min=True)

Expand All @@ -97,12 +101,16 @@ def parse_single_constraint(constraint: str) -> VersionConstraint:
op = m.group("op")
major = int(m.group(2))
minor = m.group(3)
patch = m.group(4)

if minor is not None:
version = Version.from_parts(major, int(minor), 0)
if patch is not None:
version = Version.from_parts(major, int(minor), int(patch))
result: VersionConstraint = VersionRange(
version, version.next_minor(), include_min=True
version, version.next_patch(), include_min=True
)
elif minor is not None:
version = Version.from_parts(major, int(minor), 0)
result = VersionRange(version, version.next_minor(), include_min=True)
else:
if major == 0:
result = VersionRange(max=Version.from_parts(1, 0, 0))
Expand Down
47 changes: 43 additions & 4 deletions tests/semver/test_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@ def test_parse_constraint(input: str, constraint: Version | VersionRange) -> Non
Version.from_parts(20, 0, 0), Version.from_parts(21, 0, 0), True
),
),
(
"20.*.*.*",
VersionRange(
Version.from_parts(20, 0, 0), Version.from_parts(21, 0, 0), True
),
),
(
"2.0.*",
VersionRange(
Expand All @@ -90,6 +96,24 @@ def test_parse_constraint(input: str, constraint: Version | VersionRange) -> Non
Version.from_parts(2, 2, 0), Version.from_parts(2, 3, 0), True
),
),
(
"2.2.3.*",
VersionRange(
Version.from_parts(2, 2, 3), Version.from_parts(2, 2, 4), True
),
),
(
"2.2.3.X",
VersionRange(
Version.from_parts(2, 2, 3), Version.from_parts(2, 2, 4), True
),
),
(
"2.*.X.x",
VersionRange(
Version.from_parts(2, 0, 0), Version.from_parts(3, 0, 0), True
),
),
("0.*", VersionRange(max=Version.from_parts(1, 0, 0))),
("0.*.*", VersionRange(max=Version.from_parts(1, 0, 0))),
("0.x", VersionRange(max=Version.from_parts(1, 0, 0))),
Expand Down Expand Up @@ -160,29 +184,44 @@ def test_parse_constraint_wildcard(input: str, constraint: VersionRange) -> None
Version.from_parts(3, 5, 0), Version.from_parts(3, 6, 0), True
),
),
],
)
def test_parse_constraint_tilde(input: str, constraint: VersionRange) -> None:
assert parse_constraint(input) == constraint


@pytest.mark.parametrize(
"input,constraint",
[
(
"~=3.5",
VersionRange(
Version.from_parts(3, 5, 0), Version.from_parts(4, 0, 0), True
),
), # PEP 440
),
(
"~=3.5.3",
VersionRange(
Version.from_parts(3, 5, 3), Version.from_parts(3, 6, 0), True
),
), # PEP 440
),
(
"~=3.5.3rc1",
VersionRange(
Version.from_parts(3, 5, 3, pre=ReleaseTag("rc", 1)),
Version.from_parts(3, 6, 0),
True,
),
), # PEP 440
),
(
"~=3.5.3.6",
VersionRange(
Version.from_parts(3, 5, 3, 6), Version.from_parts(3, 5, 4, 0), True
),
),
],
)
def test_parse_constraint_tilde(input: str, constraint: VersionRange) -> None:
def test_parse_constraint_tilde_pep440(input: str, constraint: VersionRange) -> None:
assert parse_constraint(input) == constraint


Expand Down