Skip to content

Simplify max_ver and min_ver #401

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
merged 1 commit into from
Apr 2, 2023
Merged

Simplify max_ver and min_ver #401

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
19 changes: 3 additions & 16 deletions src/semver/_deprecated.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

from . import cli
from .version import Version
from ._types import Decorator, F, String
from ._types import Decorator, F


def deprecated(
Expand Down Expand Up @@ -192,15 +192,7 @@ def max_ver(ver1, ver2):
>>> semver.max_ver("1.0.0", "2.0.0")
'2.0.0'
"""
if isinstance(ver1, String.__args__): # type: ignore
ver1 = Version.parse(ver1)
elif not isinstance(ver1, Version):
raise TypeError()
cmp_res = ver1.compare(ver2)
if cmp_res >= 0:
return str(ver1)
else:
return ver2
return str(max(ver1, ver2, key=Version.parse))


@deprecated(replace="min", version="2.10.2")
Expand All @@ -219,12 +211,7 @@ def min_ver(ver1, ver2):
>>> semver.min_ver("1.0.0", "2.0.0")
'1.0.0'
"""
ver1 = Version.parse(ver1)
cmp_res = ver1.compare(ver2)
if cmp_res <= 0:
return str(ver1)
else:
return ver2
return str(min(ver1, ver2, key=Version.parse))


@deprecated(replace="str(versionobject)", version="2.10.0")
Expand Down