Merge pull request #4408 from Flamefire/20231220133211_new_pr_ttolZmNdMU

fix LooseVersion on Python2
easybuilders · Dec 20, 2023 · 5ee24a7 · 5ee24a7
2 parents 9ba76dd + 03d02e6
commit 5ee24a7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/easybuild/tools/loose_version.py b/easybuild/tools/loose_version.py
@@ -81,6 +81,9 @@ def _cmp(self, other):
     def __eq__(self, other):
         return self._cmp(other) == 0
 
+    def __ne__(self, other):
+        return self._cmp(other) != 0
+
     def __lt__(self, other):
         return self._cmp(other) < 0
 

diff --git a/test/framework/utilities_test.py b/test/framework/utilities_test.py
@@ -123,6 +123,15 @@ def test_LooseVersion(self):
         self.assertLess(LooseVersion('1.02'), '2.01')
         self.assertLessEqual('1.02', LooseVersion('2.01'))
         self.assertLessEqual(LooseVersion('1.02'), '2.01')
+        # Negation of all ops, i.e. verify each op can return False
+        self.assertFalse(LooseVersion('2.02') != '2.02')
+        self.assertFalse(LooseVersion('2.02') <= '2.01')
+        self.assertFalse(LooseVersion('2.02') < '2.01')
+        self.assertFalse(LooseVersion('2.02') < '2.02')
+        self.assertFalse(LooseVersion('2.02') == '2.03')
+        self.assertFalse(LooseVersion('2.02') >= '2.03')
+        self.assertFalse(LooseVersion('2.02') > '2.03')
+        self.assertFalse(LooseVersion('2.02') > '2.02')
 
         # Some comparisons we might do: Full version on left hand side, shorter on right
         self.assertGreater(LooseVersion('2.1.5'), LooseVersion('2.1'))
@@ -135,7 +144,7 @@ def test_LooseVersion(self):
         self.assertGreater(LooseVersion('1.0'), LooseVersion('1'))
         self.assertLess(LooseVersion('1'), LooseVersion('1.0'))
 
-        # The following test is taken from Python disutils tests
+        # The following test is taken from Python distutils tests
         # licensed under the Python Software Foundation License Version 2
         versions = (('1.5.1', '1.5.2b2', -1),
                     ('161', '3.10a', 1),