Skip to content

Commit e80b3eb

Browse files
authored
Merge branch 'Feature/SemVer' into semver-inlist-matcher
2 parents 8ff29e6 + a8a7c24 commit e80b3eb

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ test=pytest
1313

1414
[tool:pytest]
1515
ignore_glob=./splitio/_OLD/*
16-
addopts = --verbose --cov=splitio --cov-report xml
16+
addopts = --verbose --cov=splitio --cov-report xml -k BetweenSemverMatcherTests
1717
python_classes=*Tests
1818

1919
[build_sphinx]

splitio/models/grammar/matchers/semver.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ def _parse(self, version):
4444
Parse the string in self.version to update the other internal variables
4545
"""
4646
without_metadata = self._remove_metadata_if_exists(version)
47-
4847
index = without_metadata.find(self._PRE_RELEASE_DELIMITER)
4948
if index == -1:
5049
self._is_stable = True

splitio/models/splits.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
"combiner": "AND",
2020
"matchers": [
2121
{
22-
"keySelector": None,
22+
"keySelector": {
23+
"trafficType": "user",
24+
"attribute": None
25+
},
2326
"matcherType": "ALL_KEYS",
2427
"negate": False,
2528
"userDefinedSegmentMatcherData": None,

tests/models/grammar/files/invalid-semantic-versions.csv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ beta
2323
1.2-RC-SNAPSHOT
2424
-1.0.3-gamma+b7718
2525
+justmeta
26-
#99999999999999999999999.999999999999999999.99999999999999999----RC-SNAPSHOT.12.09.1--------------------------------..12
2726
1.1.1+
28-
1.1.1-
27+
1.1.1-
28+
#99999999999999999999999.999999999999999999.99999999999999999----RC-SNAPSHOT.12.09.1--------------------------------..12

0 commit comments

Comments
 (0)