Skip to content

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit c40b6a4

Browse filesBrowse files
authored
Merge pull request #401 from tomschr/min_max_ver
Simplify max_ver and min_ver. This makes the two functions consistent.
2 parents 7cb958a + c72c50c commit c40b6a4
Copy full SHA for c40b6a4

File tree

1 file changed

+3
-16
lines changed
Filter options

1 file changed

+3
-16
lines changed

‎src/semver/_deprecated.py

Copy file name to clipboardExpand all lines: src/semver/_deprecated.py
+3-16
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
from . import cli
1313
from .version import Version
14-
from ._types import Decorator, F, String
14+
from ._types import Decorator, F
1515

1616

1717
def deprecated(
@@ -192,15 +192,7 @@ def max_ver(ver1, ver2):
192192
>>> semver.max_ver("1.0.0", "2.0.0")
193193
'2.0.0'
194194
"""
195-
if isinstance(ver1, String.__args__): # type: ignore
196-
ver1 = Version.parse(ver1)
197-
elif not isinstance(ver1, Version):
198-
raise TypeError()
199-
cmp_res = ver1.compare(ver2)
200-
if cmp_res >= 0:
201-
return str(ver1)
202-
else:
203-
return ver2
195+
return str(max(ver1, ver2, key=Version.parse))
204196

205197

206198
@deprecated(replace="min", version="2.10.2")
@@ -219,12 +211,7 @@ def min_ver(ver1, ver2):
219211
>>> semver.min_ver("1.0.0", "2.0.0")
220212
'1.0.0'
221213
"""
222-
ver1 = Version.parse(ver1)
223-
cmp_res = ver1.compare(ver2)
224-
if cmp_res <= 0:
225-
return str(ver1)
226-
else:
227-
return ver2
214+
return str(min(ver1, ver2, key=Version.parse))
228215

229216

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

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.