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.

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

pep440: support post/local for semver allows #158

Merged
merged 1 commit into from
Apr 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 23 additions & 4 deletions poetry/core/semver/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,29 @@ def is_empty(self) -> bool:
return False

def allows(self, version: "Version") -> bool:
return self == version
if version is None:
return False

_this, _other = self, version

# allow weak equality to allow `3.0.0+local.1` for `3.0.0`
if not _this.is_local() and _other.is_local():
_other = _other.without_local()
elif _this.is_local() and not _other.is_local():
_this = _this.without_local()

# allow weak equality to allow `3.0.0-1` for `3.0.0`
if not _this.is_postrelease() and _other.is_postrelease():
_other = _other.without_postrelease()
elif _this.without_postrelease() and not _other.without_postrelease():
_this = _this.without_postrelease()

return _this == _other

def allows_all(self, other: "VersionTypes") -> bool:
return other.is_empty() or other == self
return other.is_empty() or (
self.allows(other) if isinstance(other, self.__class__) else other == self
)

def allows_any(self, other: "VersionTypes") -> bool:
return other.allows(self)
Expand All @@ -101,15 +120,15 @@ def union(self, other: "VersionTypes") -> "VersionTypes":
return other

if isinstance(other, VersionRangeConstraint):
if other.min == self:
if self.allows(other.min):
return VersionRange(
other.min,
other.max,
include_min=True,
include_max=other.include_max,
)

if other.max == self:
if self.allows(other.max):
return VersionRange(
other.min,
other.max,
Expand Down
24 changes: 23 additions & 1 deletion tests/semver/test_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,29 @@ def test_allows():
assert not v.allows(Version.parse("1.3.3"))
assert not v.allows(Version.parse("1.2.4"))
assert not v.allows(Version.parse("1.2.3-dev"))
assert not v.allows(Version.parse("1.2.3+build"))
assert v.allows(Version.parse("1.2.3+build"))
assert v.allows(Version.parse("1.2.3-1"))
assert v.allows(Version.parse("1.2.3-1+build"))


def test_allows_with_local():
v = Version.parse("1.2.3+build.1")
assert v.allows(v)
assert not v.allows(Version.parse("1.3.3"))
assert not v.allows(Version.parse("1.2.3-dev"))
assert not v.allows(Version.parse("1.2.3+build.2"))
assert v.allows(Version.parse("1.2.3-1"))
assert v.allows(Version.parse("1.2.3-1+build.1"))


def test_allows_with_post():
v = Version.parse("1.2.3-1")
assert v.allows(v)
assert not v.allows(Version.parse("1.2.3"))
assert not v.allows(Version.parse("2.2.3"))
assert not v.allows(Version.parse("1.2.3-dev"))
assert not v.allows(Version.parse("1.2.3+build.2"))
assert v.allows(Version.parse("1.2.3-1+build.1"))


def test_allows_all():
Expand Down