merged changes from greater and less than matchers

Author: Bilal Al

setup.cfg

@@ -13,7 +13,7 @@ test=pytest
 
 [tool:pytest]
 ignore_glob=./splitio/_OLD/*
-addopts = --verbose --cov=splitio --cov-report xml
+addopts = --verbose --cov=splitio --cov-report xml -k BetweenSemverMatcherTests
 python_classes=*Tests
 
 [build_sphinx]

splitio/models/grammar/matchers/semver.py

@@ -223,7 +223,7 @@ def _match(self, key, attributes=None, context=None):
         if matching_data is None:
             return False
 
-        return self._semver.compare(Semver(matching_data)) in [0, 1]
+        return Semver(matching_data).compare(self._semver) in [0, 1]
 
     def __str__(self):
         """Return string Representation."""
@@ -268,7 +268,7 @@ def _match(self, key, attributes=None, context=None):
         if matching_data is None:
             return False
 
-        return self._semver.compare(Semver(matching_data)) in [0, -1]
+        return Semver(matching_data).compare(self._semver) in [0, -1]
 
     def __str__(self):
         """Return string Representation."""

tests/models/grammar/test_matchers.py

@@ -950,9 +950,9 @@ def test_matcher_behaviour(self, mocker):
         parsed = matchers.from_raw(self.raw)
         assert parsed._match("2.1.8+rc")
         assert parsed._match("2.1.8")
-        assert not parsed._match("2.1.11")
-        assert parsed._match("2.1.5")
-        assert parsed._match("2.1.5-rc1")
+        assert parsed._match("2.1.11")
+        assert not parsed._match("2.1.5")
+        assert not parsed._match("2.1.5-rc1")
 
     def test_to_json(self):
         """Test that the object serializes to JSON properly."""
@@ -990,9 +990,9 @@ def test_matcher_behaviour(self, mocker):
         parsed = matchers.from_raw(self.raw)
         assert parsed._match("2.1.8+rc")
         assert parsed._match("2.1.8")
-        assert parsed._match("2.1.11")
-        assert not parsed._match("2.1.5")
-        assert not parsed._match("2.1.5-rc1")
+        assert not parsed._match("2.1.11")
+        assert parsed._match("2.1.5")
+        assert parsed._match("2.1.5-rc1")
 
     def test_to_json(self):
         """Test that the object serializes to JSON properly."""