Adjust tests according to rebase

Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>

Author: TG1999

src/univers/versions.py

@@ -592,7 +592,6 @@ def __ge__(self, other):
         return isinstance(self.value, SemverVersion)
 
 
-@attr.s(frozen=True, order=False, eq=False, hash=True)
 class ConanVersion(Version):
     @classmethod
     def build_value(cls, string):
@@ -678,42 +677,6 @@ def next_patch(self):
     def bump(self, index):
         return self.value and self.value.bump(index)
 
-    def __eq__(self, other):
-        if other is None:
-            return False
-        if not isinstance(other, ConanVersion):
-            other = ConanVersion.build_value(other)
-            return self.value == other
-        return self.value == other.value
-
-    def __lt__(self, other):
-        if other is None:
-            return False
-        if not isinstance(other, ConanVersion):
-            other = ConanVersion(str(other))
-        return self.value < other.value
-
-    def __le__(self, other):
-        if other is None:
-            return False
-        if not isinstance(other, ConanVersion):
-            other = ConanVersion(str(other))
-        return self.value <= other.value
-
-    def __gt__(self, other):
-        if other is None:
-            return False
-        if not isinstance(other, ConanVersion):
-            other = ConanVersion(str(other))
-        return self.value > other.value
-
-    def __ge__(self, other):
-        if other is None:
-            return False
-        if not isinstance(other, ConanVersion):
-            other = ConanVersion(str(other))
-        return self.value >= other.value
-
 
 AVAILABLE_VERSIONS = [
     SemverVersion,

tests/data/conan_advisory.json

@@ -2446,7 +2446,7 @@
         "test_index": 350,
         "scheme": "conan",
         "native": ">=1.0.2 <=1.0.2v",
-        "expected_vers": "vers:conan/<=1.0.2|>=1.0.2",
+        "expected_vers": "vers:conan/>=1.0.2|<=1.0.2v",
         "gitlab_scheme": "conan"
     },
     {

tests/data/openssl/openssl_versort_expected.json

@@ -169,11 +169,6 @@
     "normalized_string": "0.9.8",
     "value": "0.9.8"
   },
-  {
-    "string": "0.9.8v",
-    "normalized_string": "0.9.8",
-    "value": "0.9.8"
-  },
   {
     "string": "0.9.8a",
     "normalized_string": "0.9.8a",
@@ -279,6 +274,11 @@
     "normalized_string": "0.9.8u",
     "value": "0.9.8u"
   },
+  {
+    "string": "0.9.8v",
+    "normalized_string": "0.9.8v",
+    "value": "0.9.8v"
+  },
   {
     "string": "0.9.8w",
     "normalized_string": "0.9.8w",
@@ -554,11 +554,6 @@
     "normalized_string": "1.0.2",
     "value": "1.0.2"
   },
-  {
-    "string": "1.0.2v",
-    "normalized_string": "1.0.2",
-    "value": "1.0.2"
-  },
   {
     "string": "1.0.2a",
     "normalized_string": "1.0.2a",
@@ -664,6 +659,11 @@
     "normalized_string": "1.0.2u",
     "value": "1.0.2u"
   },
+  {
+    "string": "1.0.2v",
+    "normalized_string": "1.0.2v",
+    "value": "1.0.2v"
+  },
   {
     "string": "1.0.2w",
     "normalized_string": "1.0.2w",
@@ -696,8 +696,8 @@
   },
   {
     "string": "1.0.2zc-dev",
-    "normalized_string": "1.0.2zc-de",
-    "value": "1.0.2zc-de"
+    "normalized_string": "1.0.2zc-dev",
+    "value": "1.0.2zc-dev"
   },
   {
     "string": "1.0.2zd",

tests/test_conan_version_comparison.py

@@ -63,12 +63,12 @@ def test_comparison(v1, v2):
 def test_comparison_with_integer():
     v1 = ConanVersion("13.0")
     # Issue: https://github.com/conan-io/conan/issues/12907
-    assert v1 > 5
-    assert v1 >= 5
-    assert v1 < 20
-    assert v1 <= 20
-    assert v1 == 13
-    assert v1 != 14
+    assert v1 > ConanVersion("5")
+    assert v1 >= ConanVersion("5")
+    assert v1 < ConanVersion("20")
+    assert v1 <= ConanVersion("20")
+    assert v1 == ConanVersion("13")
+    assert v1 != ConanVersion("14")
 
 
 e = [

tests/test_conan_version_range.py

@@ -58,7 +58,7 @@ def test_range(version_range, conditions, versions_in, versions_out):
     for condition_set, expected_condition_set in zip(r.condition_sets, conditions):
         for condition, expected_condition in zip(condition_set.conditions, expected_condition_set):
             assert condition.operator == expected_condition[0]
-            assert condition.version == expected_condition[1]
+            assert condition.version == ConanVersion(expected_condition[1])
 
     for v in versions_in:
         assert ConanVersion(v) in r