Skip to content

Pre release range fix #40

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
podhmo merged 2 commits into from
Sep 15, 2021
Merged

Pre release range fix #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fb7988
Adding various 'range' tests
software-natives-docker Mar 4, 2020
9ba98ba
Fixing various preprelease related problems
software-natives-docker Mar 4, 2020
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
12 changes: 8 additions & 4 deletions semver/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ def clean(version, loose):
NUMERIC = re.compile(r"^\d+$")


def semver(version, loose):
def semver(version, loose, include_prerelease=False):
if isinstance(version, SemVer):
if version.loose == loose:
return version
Expand All @@ -299,7 +299,7 @@ def semver(version, loose):
if (!(this instanceof SemVer))
return new SemVer(version, loose);
"""
return SemVer(version, loose)
return SemVer(version, loose, include_prerelease)


make_semver = semver
Expand All @@ -308,9 +308,10 @@ def semver(version, loose):
class SemVer(object):
# major, minor, patch, prerelease, build, micro_version

def __init__(self, version, loose):
def __init__(self, version, loose, include_prerelease):
logger.debug("SemVer %s, %s", version, loose)
self.loose = loose
self.include_prerelease = include_prerelease
self.raw = version
self.micro_versions = []
self.build = []
Expand Down Expand Up @@ -408,6 +409,9 @@ def compare_pre(self, other):
if not isinstance(other, SemVer):
other = make_semver(other, self.loose)

if self.include_prerelease:
return 0

# NOT having a prerelease is > having one
is_self_more_than_zero = len(self.prerelease) > 0
is_other_more_than_zero = len(other.prerelease) > 0
Expand Down Expand Up @@ -811,7 +815,7 @@ def test(self, version, include_prerelease=False):
return False

if isinstance(version, str):
version = make_semver(version, loose=self.loose)
version = make_semver(version, loose=self.loose, include_prerelease=include_prerelease)

for e in self.set:
if test_set(e, version, include_prerelease=include_prerelease):
Expand Down
42 changes: 41 additions & 1 deletion semver/tests/test_max_satisfying.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,47 @@
[['1.1.0', '1.2.0', '1.2.1', '1.3.0', '2.0.0b1', '2.0.0b2', '2.0.0', '2.0.1b1', '2.1.0'], '~2.0.0', '2.0.0',
True, False],
[['1.1.0', '1.2.0', '1.2.1', '1.3.0', '2.0.0b1', '2.0.0b2', '2.0.0', '2.0.1b1', '2.1.0'], '~2.0.0', '2.0.1b1',
True, True]
True, True],

[['1.0.1-beta'], '1.x', None, False, False],
[['1.0.1-beta'], '1.x', '1.0.1-beta', False, True],
[['1.0.0-beta'], '1.x', '1.0.0-beta', False, True],
[['1.1.0-beta'], '1.0.x', None, False, True],
[['1.0.0-beta', '1.1.0-beta', '1.1.0'], '1.0.x', None, False, False],
[['1.0.0-beta', '1.1.0-beta', '1.1.0'], '1.0.x', '1.0.0-beta', False, True],

# testing with range '>' and '<'
[['1.0.0-beta', '1.0.0', '1.0.1-beta', '1.0.2-beta'], '>1.0.0 <1.0.2', None, False, False],
[['1.0.0-beta', '1.0.0', '1.0.1-beta', '1.0.2-beta'], '>1.0.0 <1.0.2', '1.0.1-beta', False, True],
[['1.0.0-beta', '1.0.0', '1.0.1', '1.1.0-beta', '1.1.0'], '>1.0.0 <1.1.0', '1.0.1', False, False],
[['1.0.0-beta', '1.0.0', '1.0.1', '1.1.0-beta', '1.1.0'], '>1.0.0 <1.1.0', '1.0.1', False, True],
[['1.0.0-beta', '1.1.0-beta'], '>1.0.0 <1.1.0', None, False, True],

# testing with range '>=' and '<=' and '<'
[['1.0.0-beta', '1.1.0-beta', '1.0.0'], '>=1.0.0 <=1.0.1', '1.0.0', False, False],
[['1.0.0-beta', '1.1.0-beta', '1.0.0'], '>=1.0.0 <=1.0.1', '1.0.0', False, True],
[['1.0.0-beta', '1.0.0', '1.0.1', '1.1.0-beta'], '>=1.0.0 <=1.1.0', '1.0.1', False, False],
[['1.0.0-beta', '1.0.0', '1.0.1', '1.1.0-beta'], '>=1.0.0 <=1.1.0', '1.1.0-beta', False, True],
[['1.0.0-beta', '1.0.0', '1.0.1', '1.1.0-beta'], '>=1.0.0 <1.1.0', '1.0.1', False, False],
[['1.0.0-beta', '1.0.0', '1.0.1', '1.1.0-beta'], '>=1.0.0 <1.1.0', '1.0.1', False, True],
[['1.0.0-beta', '1.1.0-beta'], '>=1.0.0 <=1.1.0', None, False, False],
[['1.0.0-beta', '1.1.0-beta'], '>=1.0.0 <=1.1.0', '1.1.0-beta', False, True],

# explicitly specifying range begin/end with prerelease
[['1.0.0-beta', '1.1.0-beta', '1.0.0'], '>=1.0.0-0 <1.0.1', '1.0.0', False, True],
[['1.0.0-beta', '1.1.0-beta', '1.1.0'], '>=1.0.0-0 <1.1.0-0', '1.0.0-beta', False, True],
[['1.0.0-beta', '1.0.0', '1.0.1', '1.1.0-beta', '1.1.0'], '>=1.0.0-0 <1.1.0-0', '1.0.1', False, False],
[['1.0.0-beta', '1.0.0', '1.0.1', '1.1.0-beta', '1.1.0'], '>=1.0.0-0 <1.1.0-0', '1.0.1', False, True],
[['1.0.0-beta', '1.1.0-beta'], '>=1.0.0-0 <1.1.0', '1.0.0-beta', False, True],

[['1.0.0-pre'], '1.0.x', '1.0.0-pre', False, True],
[['1.0.0-pre'], '>=1.0.x', '1.0.0-pre', False, True],

[['1.1.0-pre'], '>=1.0.0 <1.1.1-z', None, False, False],
# Note: This test would fail with `node-semver`, see also https://github.com/npm/node-semver/issues/317
[['1.1.1-pre'], '>=1.0.0 <1.1.1-z', '1.1.1-pre', False, False],
# While this one would succeed with `node-semver`
# [['1.0.0-pre'], '>=1.0.0 <=1.1.0', None, False, True],

]

Expand Down