From 61ebc95ccb23ecdd5a55e6529c333c8305d6bfbf Mon Sep 17 00:00:00 2001 From: Tushar Goel Date: Thu, 5 Jan 2023 10:20:21 +0530 Subject: [PATCH 1/2] Add mattermost version range Signed-off-by: Tushar Goel --- src/univers/version_range.py | 6 ++++++ tests/test_version_range.py | 16 +++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/univers/version_range.py b/src/univers/version_range.py index 6068b325..3b4b053d 100644 --- a/src/univers/version_range.py +++ b/src/univers/version_range.py @@ -1092,6 +1092,11 @@ def from_native(cls, string): return cls(constraints=constraints) +class MattermostVersionRange(VersionRange): + scheme = "mattermost" + version_class = versions.SemverVersion + + def from_gitlab_native(gitlab_scheme, string): purl_scheme = PURL_TYPE_BY_GITLAB_SCHEME[gitlab_scheme] vrc = RANGE_CLASS_BY_SCHEMES[purl_scheme] @@ -1217,6 +1222,7 @@ def build_range_from_github_advisory_constraint(scheme: str, string: str): "alpm": ArchLinuxVersionRange, "nginx": NginxVersionRange, "openssl": OpensslVersionRange, + "mattermost": MattermostVersionRange, } PURL_TYPE_BY_GITLAB_SCHEME = { diff --git a/tests/test_version_range.py b/tests/test_version_range.py index a7ee2779..9c78992c 100644 --- a/tests/test_version_range.py +++ b/tests/test_version_range.py @@ -9,7 +9,7 @@ import pytest from univers.version_constraint import VersionConstraint -from univers.version_range import GemVersionRange +from univers.version_range import GemVersionRange, MattermostVersionRange from univers.version_range import from_gitlab_native from univers.version_range import NugetVersionRange from univers.version_range import InvalidVersionRange @@ -413,3 +413,17 @@ def test_invert(): vers_with_star_operator = VersionRange.from_string("vers:gem/*") assert vers_with_star_operator.invert() == None + + +def test_mattermost_version_range(): + assert MattermostVersionRange( + constraints=[ + VersionConstraint(comparator="=", version=SemverVersion("5.0")), + ] + ) == VersionRange.from_string("vers:mattermost/5.0") + + assert MattermostVersionRange( + constraints=[ + VersionConstraint(comparator=">=", version=SemverVersion("5.0")), + ] + ) == VersionRange.from_string("vers:mattermost/>=5.0") From c3604f99b3379db2f9f5448d0775a6afcec8d6bb Mon Sep 17 00:00:00 2001 From: Philippe Ombredanne Date: Fri, 13 Jan 2023 17:12:56 +0100 Subject: [PATCH 2/2] Ue one import per line Signed-off-by: Philippe Ombredanne --- tests/test_version_range.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_version_range.py b/tests/test_version_range.py index 9c78992c..a709d012 100644 --- a/tests/test_version_range.py +++ b/tests/test_version_range.py @@ -9,7 +9,8 @@ import pytest from univers.version_constraint import VersionConstraint -from univers.version_range import GemVersionRange, MattermostVersionRange +from univers.version_range import GemVersionRange +from univers.version_range import MattermostVersionRange from univers.version_range import from_gitlab_native from univers.version_range import NugetVersionRange from univers.version_range import InvalidVersionRange