|
 |
b7dda56 |
From 3dec94dc859b2288e3d55603b1c1e79f5290e0cd Mon Sep 17 00:00:00 2001
|
|
|
b7dda56 |
From: Fabio Valentini <decathorpe@gmail.com>
|
|
|
b7dda56 |
Date: Nov 03 2022 20:40:20 +0000
|
|
|
b7dda56 |
Subject: add more tests for version comparisons and reformat with black
|
|
|
b7dda56 |
|
|
|
b7dda56 |
|
|
|
b7dda56 |
---
|
|
|
b7dda56 |
|
|
|
b7dda56 |
diff --git a/rust2rpm/core/metadata.py b/rust2rpm/core/metadata.py
|
|
|
b7dda56 |
index 7f2bb1f..4ec0895 100644
|
|
|
b7dda56 |
--- a/rust2rpm/core/metadata.py
|
|
|
b7dda56 |
+++ b/rust2rpm/core/metadata.py
|
|
|
b7dda56 |
@@ -165,10 +165,7 @@ class CargoSemVer:
|
|
|
b7dda56 |
or (v1.major == v2.major and v1.minor == v2.minor and v1.patch > v2.patch)
|
|
|
b7dda56 |
)
|
|
|
b7dda56 |
elif op == CargoSemVer.KIND_GTE:
|
|
|
b7dda56 |
- return (
|
|
|
b7dda56 |
- CargoSemVer.eval_(v1, CargoSemVer.KIND_GT, v2)
|
|
|
b7dda56 |
- or CargoSemVer.eval_(v1, CargoSemVer.KIND_SHORTEQ, v2)
|
|
|
b7dda56 |
- )
|
|
|
b7dda56 |
+ return CargoSemVer.eval_(v1, CargoSemVer.KIND_GT, v2) or CargoSemVer.eval_(v1, CargoSemVer.KIND_SHORTEQ, v2)
|
|
|
b7dda56 |
elif op == CargoSemVer.KIND_LT:
|
|
|
b7dda56 |
return (
|
|
|
b7dda56 |
(v1.major < v2.major)
|
|
|
b7dda56 |
@@ -176,10 +173,7 @@ class CargoSemVer:
|
|
|
b7dda56 |
or (v1.major == v2.major and v1.minor == v2.minor and v1.patch < v2.patch)
|
|
|
b7dda56 |
)
|
|
|
b7dda56 |
elif op == CargoSemVer.KIND_LTE:
|
|
|
b7dda56 |
- return (
|
|
|
b7dda56 |
- CargoSemVer.eval_(v1, CargoSemVer.KIND_LT, v2)
|
|
|
b7dda56 |
- or CargoSemVer.eval_(v1, CargoSemVer.KIND_SHORTEQ, v2)
|
|
|
b7dda56 |
- )
|
|
|
b7dda56 |
+ return CargoSemVer.eval_(v1, CargoSemVer.KIND_LT, v2) or CargoSemVer.eval_(v1, CargoSemVer.KIND_SHORTEQ, v2)
|
|
|
b7dda56 |
else:
|
|
|
b7dda56 |
raise ValueError(f"Cannot evaluate operator: {op}")
|
|
|
b7dda56 |
|
|
|
b7dda56 |
diff --git a/rust2rpm/tests/test_version.py b/rust2rpm/tests/test_version.py
|
|
|
b7dda56 |
index 746d9e0..4a338c0 100644
|
|
|
b7dda56 |
--- a/rust2rpm/tests/test_version.py
|
|
|
b7dda56 |
+++ b/rust2rpm/tests/test_version.py
|
|
|
b7dda56 |
@@ -149,9 +149,13 @@ def test_coerce(version, coerced_version):
|
|
|
b7dda56 |
"v1, op, v2, expected",
|
|
|
b7dda56 |
[
|
|
|
b7dda56 |
(Version(0, 2, 2, None, None), CargoSemVer.KIND_GT, Version(0, 3, 5, None, None), False),
|
|
|
b7dda56 |
+ (Version(0, 2, 2, None, None), CargoSemVer.KIND_LT, Version(0, 3, 5, None, None), True),
|
|
|
b7dda56 |
(Version(0, 2, 2, None, None), CargoSemVer.KIND_GTE, Version(0, 3, 5, None, None), False),
|
|
|
b7dda56 |
+ (Version(0, 2, 2, None, None), CargoSemVer.KIND_LTE, Version(0, 3, 5, None, None), True),
|
|
|
b7dda56 |
(Version(0, 3, 5, None, None), CargoSemVer.KIND_LT, Version(0, 2, 2, None, None), False),
|
|
|
b7dda56 |
+ (Version(0, 3, 5, None, None), CargoSemVer.KIND_GT, Version(0, 2, 2, None, None), True),
|
|
|
b7dda56 |
(Version(0, 3, 5, None, None), CargoSemVer.KIND_LTE, Version(0, 2, 2, None, None), False),
|
|
|
b7dda56 |
+ (Version(0, 3, 5, None, None), CargoSemVer.KIND_GTE, Version(0, 2, 2, None, None), True),
|
|
|
b7dda56 |
],
|
|
|
b7dda56 |
)
|
|
|
b7dda56 |
def test_eval(v1, op, v2, expected):
|
|
|
b7dda56 |
|