From d710d2216bd6d880780640edebaf0f95790bca3e Mon Sep 17 00:00:00 2001 From: ziad hany Date: Tue, 4 Apr 2023 17:31:44 +0200 Subject: [PATCH 1/4] Add support for CargoVersion and CargoVersionRange Signed-off-by: ziadhany --- src/univers/version_range.py | 56 ++++++++++- src/univers/versions.py | 6 ++ tests/test_cargo.py | 151 ++++++++++++++++++++++++++++++ tests/test_cargo_version_range.py | 98 +++++++++++++++++++ 4 files changed, 307 insertions(+), 4 deletions(-) create mode 100644 tests/test_cargo.py create mode 100644 tests/test_cargo_version_range.py diff --git a/src/univers/version_range.py b/src/univers/version_range.py index 37138aae..23e484cb 100644 --- a/src/univers/version_range.py +++ b/src/univers/version_range.py @@ -18,6 +18,7 @@ from univers.utils import remove_spaces from univers.version_constraint import VersionConstraint from univers.version_constraint import contains_version +from univers.versions import CargoVersion class InvalidVersionRange(Exception): @@ -299,7 +300,8 @@ class NpmVersionRange(VersionRange): ">=": ">=", "<": "<", ">": ">", - "=": "=", # This is not a native node-semver comparator, but is used in the gitlab version range for npm packages. + "=": "=", + # This is not a native node-semver comparator, but is used in the gitlab version range for npm packages. } @classmethod @@ -797,7 +799,8 @@ class ComposerVersionRange(VersionRange): ">=": ">=", "<": "<", ">": ">", - "=": "=", # This is not a native composer-semver comparator, but is used in the gitlab version range for composer packages. + "=": "=", + # This is not a native composer-semver comparator, but is used in the gitlab version range for composer packages. } @@ -899,7 +902,8 @@ class GolangVersionRange(VersionRange): ">=": ">=", "<": "<", ">": ">", - "=": "=", # This is not a native golang-semver comparator, but is used in the gitlab version range for go packages. + "=": "=", + # This is not a native golang-semver comparator, but is used in the gitlab version range for go packages. } @@ -922,7 +926,51 @@ class HexVersionRange(VersionRange): class CargoVersionRange(VersionRange): scheme = "cargo" - version_class = versions.SemverVersion + version_class = versions.CargoVersion + + @classmethod + def from_native(cls, string): + """ + Return a VersionRange built from a scheme-specific, native version range + ``string``. Subclasses can implement. + """ + if string == "*": + return cls( + constraints=[VersionConstraint(comparator="*", version_class=cls.version_class)] + ) + + constraint_strings = string.split(",") + constraints = [] + + # caret + if string.startswith("^"): + string = string.replace("^", "=") + + # tilde + if string.startswith("~"): + version = string.lstrip("~") + lower_bound = CargoVersion(version) + if lower_bound.minor == 0 and lower_bound.patch == 0: + upper_bound = CargoVersion(str(lower_bound.value.next_major())) + else: + upper_bound = CargoVersion(str(lower_bound.value.next_minor())) + + return cls( + constraints=( + VersionConstraint(comparator=">=", version=lower_bound), + VersionConstraint(comparator="<", version=upper_bound), + ) + ) + + for constraint in constraint_strings: + if not constraint: + raise InvalidVersionRange + else: + vs = VersionConstraint.split(string) + version = cls.version_class(vs[1]) + constraint = VersionConstraint(comparator=vs[0], version=version) + constraints.append(constraint) + return cls(constraints=tuple(constraints)) class MozillaVersionRange(VersionRange): diff --git a/src/univers/versions.py b/src/univers/versions.py index 768a2c86..561d7f58 100644 --- a/src/univers/versions.py +++ b/src/univers/versions.py @@ -25,6 +25,7 @@ Each subclass primary responsibility to is be comparable and orderable """ + # TODO: Add mozilla versions https://github.com/mozilla-releng/mozilla-version # TODO: Add conda versions https://github.com/conda/conda/blob/master/conda/models/version.py # and https://docs.conda.io/projects/conda-build/en/latest/resources/package-spec.html#build-version-spec @@ -686,6 +687,10 @@ def bump(self, index): return self.value and self.value.bump(index) +class CargoVersion(SemverVersion): + pass + + AVAILABLE_VERSIONS = [ SemverVersion, GolangVersion, @@ -702,4 +707,5 @@ def bump(self, index): OpensslVersion, LegacyOpensslVersion, AlpineLinuxVersion, + CargoVersion, ] diff --git a/tests/test_cargo.py b/tests/test_cargo.py new file mode 100644 index 00000000..de186864 --- /dev/null +++ b/tests/test_cargo.py @@ -0,0 +1,151 @@ +import pytest + +from univers.versions import CargoVersion + + +def test_compare(): + """ + 1.2.3 := >=1.2.3, <2.0.0 + 1.2 := >=1.2.0, <2.0.0 + 1 := >=1.0.0, <2.0.0 + 0.2.3 := >=0.2.3, <0.3.0 + 0.2 := >=0.2.0, <0.3.0 + 0.0.3 := >=0.0.3, <0.0.4 + 0.0 := >=0.0.0, <0.1.0 + 0 := >=0.0.0, <1.0.0 + """ + + assert CargoVersion("1.2.3") >= CargoVersion("1.2.3") + assert CargoVersion("1.2.3") < CargoVersion("2.0.0") + + assert CargoVersion("1.2") >= CargoVersion("1.2.0") + assert CargoVersion("1.2") < CargoVersion("2.0.0") + + assert CargoVersion("1") >= CargoVersion("1.0.0") + assert CargoVersion("1") < CargoVersion("2.0.0") + + assert CargoVersion("0.2.3") >= CargoVersion("0.2.3") + assert CargoVersion("0.2.3") < CargoVersion("0.3.0") + + assert CargoVersion("0.2") >= CargoVersion("0.2.0") + assert CargoVersion("0.2") < CargoVersion("0.3.0") + + assert CargoVersion("0.0.3") >= CargoVersion("0.0.3") + assert CargoVersion("0.0.3") < CargoVersion("0.0.4") + + assert CargoVersion("0.0") >= CargoVersion("0.0.0") + assert CargoVersion("0.0") < CargoVersion("0.1.0") + + assert CargoVersion("0") >= CargoVersion("0.0.0") + assert CargoVersion("0") < CargoVersion("1.0.0") + + +version_list = [ + ("1.2.3", 1, 2, 3, (), ()), + ("1.2.3-alpha1", 1, 2, 3, ("alpha1",), ()), + ("1.2.3+build5", 1, 2, 3, (), ("build5",)), + ("1.2.3+5build", 1, 2, 3, (), ("5build",)), + ("1.2.3-alpha1+build5", 1, 2, 3, ("alpha1",), ("build5",)), + ( + "1.2.3-1.alpha1.9+build5.7.3aedf", + 1, + 2, + 3, + ( + "1", + "alpha1", + "9", + ), + ( + "build5", + "7", + "3aedf", + ), + ), + ( + "1.2.3-0a.alpha1.9+05build.7.3aedf", + 1, + 2, + 3, + ( + "0a", + "alpha1", + "9", + ), + ( + "05build", + "7", + "3aedf", + ), + ), + ( + "0.4.0-beta.1+0851523", + 0, + 4, + 0, + ( + "beta", + "1", + ), + ("0851523",), + ), + ("1.1.0-beta-10", 1, 1, 0, ("beta-10",), ()), +] + + +@pytest.mark.parametrize( + "version, expected_major, expected_minor, expected_patch, expected_prerelease, expected_build", + version_list, +) +def test_cargo( + version, expected_major, expected_minor, expected_patch, expected_prerelease, expected_build +): + # https://github.com/dtolnay/semver/blob/master/tests/test_version.rs : + v1 = CargoVersion(version) + assert v1.major == expected_major + assert v1.minor == expected_minor + assert v1.patch == expected_patch + assert v1.prerelease == expected_prerelease + assert v1.build == expected_build + + +def test_cargo1(): + assert CargoVersion("1.2.3") == CargoVersion("1.2.3") + assert CargoVersion("1.2.3-alpha1") == CargoVersion("1.2.3-alpha1") + assert CargoVersion("1.2.3+build.42") == CargoVersion("1.2.3+build.42") + assert CargoVersion("1.2.3-alpha1+42") == CargoVersion("1.2.3-alpha1+42") + assert CargoVersion("0.0.0") != CargoVersion("0.0.1") + assert CargoVersion("0.0.0") != CargoVersion("0.1.0") + assert CargoVersion("0.0.0") != CargoVersion("1.0.0") + assert CargoVersion("1.2.3-alpha") != CargoVersion("1.2.3-beta") + assert CargoVersion("1.2.3+23") != CargoVersion("1.2.3+42") + + assert CargoVersion("0.0.0") < CargoVersion("1.2.3-alpha2") + assert CargoVersion("1.0.0") < CargoVersion("1.2.3-alpha2") + assert CargoVersion("1.2.0") < CargoVersion("1.2.3-alpha2") + assert CargoVersion("1.2.3-alpha1") < CargoVersion("1.2.3") + assert CargoVersion("1.2.3-alpha1") < CargoVersion("1.2.3-alpha2") + assert not (CargoVersion("1.2.3-alpha2") < CargoVersion("1.2.3-alpha2")) + assert CargoVersion("1.2.3+23") < CargoVersion("1.2.3+42") + + assert CargoVersion("0.0.0") <= CargoVersion("1.2.3-alpha2") + assert CargoVersion("1.0.0") <= CargoVersion("1.2.3-alpha2") + assert CargoVersion("1.2.0") <= CargoVersion("1.2.3-alpha2") + assert CargoVersion("1.2.3-alpha1") <= CargoVersion("1.2.3-alpha2") + assert CargoVersion("1.2.3-alpha2") <= CargoVersion("1.2.3-alpha2") + assert CargoVersion("1.2.3+23") <= CargoVersion("1.2.3+42") + + assert CargoVersion("1.2.3-alpha2") > CargoVersion("0.0.0") + assert CargoVersion("1.2.3-alpha2") > CargoVersion("1.0.0") + assert CargoVersion("1.2.3-alpha2") > CargoVersion("1.2.0") + assert CargoVersion("1.2.3-alpha2") > CargoVersion("1.2.3-alpha1") + assert CargoVersion("1.2.3") > CargoVersion("1.2.3-alpha2") + assert not (CargoVersion("1.2.3-alpha2") > CargoVersion("1.2.3-alpha2")) + assert not (CargoVersion("1.2.3+23") > CargoVersion("1.2.3+42")) + + assert CargoVersion("1.2.3-alpha2") >= CargoVersion("0.0.0") + assert CargoVersion("1.2.3-alpha2") >= CargoVersion("1.0.0") + assert CargoVersion("1.2.3-alpha2") >= CargoVersion("1.2.0") + assert CargoVersion("1.2.3-alpha2") >= CargoVersion("1.2.3-alpha1") + assert CargoVersion("1.2.3-alpha2") >= CargoVersion("1.2.3-alpha2") + assert not (CargoVersion("1.2.3+23") >= CargoVersion("1.2.3+42")) diff --git a/tests/test_cargo_version_range.py b/tests/test_cargo_version_range.py new file mode 100644 index 00000000..4cab90b0 --- /dev/null +++ b/tests/test_cargo_version_range.py @@ -0,0 +1,98 @@ +import pytest + +from univers.version_range import CargoVersionRange +from univers.version_range import InvalidVersionRange +from univers.versions import CargoVersion + +values = [ + # https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html + # caret + ["^1.2.3", [[["=", "1.2.3"]]], ["1.2.3"], ["1.2.4"]], + # tilde + ["~1.2.3", [[[">=", "1.2.3"], ["<", "1.3.0"]]], ["1.2.4"], ["2.0.1"]], + ["~1.2", [[[">=", "1.2.0"], ["<", "1.3.0"]]], ["1.2.5"], ["1.3.1"]], + [ + "~1", + [[[">=", "1.0.0"], ["<", "2.0.0"]]], + ["1.3.0", "1.8.1"], + ["2.1.0", "2.2"], + ], # tilde increment the major + # wildcard + ["*", [[[">=", "0.0.0"]]], ["1.0.0", "2.0.0"], []], + # ["1.*", [[[">=", "1.0.0"]]], ["1.0.0"], ["2", "1.0.1"]], + # ["1.2.*", [[[">=", "1.2.0"], ["<", "1.3.0"]]], ["1.2", "1.2.1"], ["2.1.0", "2.2"]], + # https://github.com/dtolnay/semver/blob/master/tests/test_version_req.rs : + ["=1.0.0", [["=", "1.0.0"]], ["1.0.0"], ["1.0.1", "0.9.9", "0.10.0", "0.1.0", "1.0.0-pre"]], + ["=0.9.0", [["=", "0.9.0"]], ["0.9.0"], ["0.9.1", "1.9.0", "0.0.9", "0.9.0-pre"]], + ["=0.0.2", [["=", "0.0.2"]], ["0.0.2"], ["0.0.1", "0.0.3", "0.0.2-pre"]], + [ + "=0.1.0-beta2.a", + [["=", "0.1.0-beta2.a"]], + ["0.1.0-beta2.a"], + ["0.9.1", "0.1.0", "0.1.1-beta2.a", "0.1.0-beta2"], + ], + # ["=0.1.0+meta", [["=", "0.1.0+meta"]], ["0.1.0", "0.1.0+meta", "0.1.0+any"], []], + # ["<1.0.0", [["<", "1.0.0"]], ["0.1.0", "0.0.1"], ["1.0.0", "1.0.0-beta", "1.0.1", "0.9.9-alpha"]], + # [ + # "<= 2.1.0-alpha2", + # [["<", "2.1.0-alpha2"], ["=", "2.1.0-alpha2"]], + # ["2.1.0-alpha2", "2.1.0-alpha1", "2.0.0", "1.0.0"], + # ["2.1.0", "2.2.0-alpha1", "2.0.0-alpha2", "1.0.0-alpha2"], + # ], + # [">1.0.0-alpha, <1.0.0", [[[">", "2.1.0-alpha2"], ["<", "1.0.0"]]], ["1.0.0-beta"], []], + # [">1.0.0-alpha, <1.0", [[[">", "1.0.0-alpha"], ["<", "1.0"]]], ["1.0.0-beta"], []], + # [">1.0.0-alpha, <1", [[[">", "1.0.0-alpha"], ["<", "1"]]], ["1.0.0-beta"], []], + # [ + # ">=0.5.1-alpha3, <0.6", + # [[[">", "0.5.1-alpha3"], ["=", "0.5.1-alpha3"], ["<", "0.6"]]], + # ["0.5.1-alpha3", "0.5.1-alpha4", "0.5.1-beta", "0.5.1", "0.5.5"], + # ["0.5.1-alpha1", "0.5.2-alpha3", "0.5.5-pre", "0.5.0-pre"], + # ], + ["~1", [], ["1.0.0", "1.0.1", "1.1.1"], ["0.9.1", "2.9.0", "0.0.9"]], + ["~1.2", [], ["1.2.0", "1.2.1"], ["1.1.1", "1.3.0", "0.0.9"]], + ["~1.2.2", [], ["1.2.2", "1.2.4"], ["1.2.1", "1.9.0", "1.0.9", "2.0.1", "0.1.3"]], + # [ + # "~1.2.3-beta.2", + # [], + # ["1.2.3", "1.2.4", "1.2.3-beta.2", "1.2.3-beta.4"], + # ["1.3.3", "1.1.4", "1.2.3-beta.1", "1.2.4-beta.2"], + # ], +] + +error_list = [ + "> 0.1.0,", + "> 0.3.0, ,", + # "1.2.3 - 2.3.4", + # "> 0.0.9 <= 2.5.3", + # "=1.2.3 || =2.3.4", + # "1.1 || =1.2.3", + # "6.* || 8.* || >= 10.*", + # ">= >= 0.0.2", + # ">== 0.0.2", + # "a.0.0", + # "1.0.0-", + # ">=", + # "*.1", + # "1.*.1", + # ">=1.*.1", + # "*, 0.20.0-any", + # "0.20.0-any, *" "0.20.0-any, *, 1.0", +] + + +@pytest.mark.parametrize("version_range, conditions, versions_in, versions_out", values) +def test_range(version_range, conditions, versions_in, versions_out): + r = CargoVersionRange.from_native(version_range) + # TODO test Version Constraints + + for v in versions_in: + assert CargoVersion(v) in r + + for v in versions_out: + assert CargoVersion(v) not in r + + +def test_error(): + for i in error_list: + with pytest.raises(InvalidVersionRange): + CargoVersionRange.from_native(i) From 7757ea0f89ed1b50d0a6fc2a59feebdb63c6076d Mon Sep 17 00:00:00 2001 From: ziad hany Date: Tue, 11 Apr 2023 17:29:11 +0200 Subject: [PATCH 2/4] Add all version range test cases Signed-off-by: ziadhany --- src/univers/version_range.py | 94 ++++++++++++------- tests/test_cargo_version_range.py | 146 +++++++++++++++++++----------- 2 files changed, 158 insertions(+), 82 deletions(-) diff --git a/src/univers/version_range.py b/src/univers/version_range.py index 23e484cb..77b1ad82 100644 --- a/src/univers/version_range.py +++ b/src/univers/version_range.py @@ -223,9 +223,9 @@ def __contains__(self, version): def __eq__(self, other): return ( - self.scheme == other.scheme - and self.version_class == other.version_class - and self.constraints == other.constraints + self.scheme == other.scheme + and self.version_class == other.version_class + and self.constraints == other.constraints ) @@ -355,9 +355,9 @@ def from_native(cls, string): ) else: if ( - constraint.endswith(".x") - or constraint.startswith("~") - or constraint.startswith("^") + constraint.endswith(".x") + or constraint.startswith("~") + or constraint.startswith("^") ): constraints.extend( get_npm_version_constraints_from_semver_npm_spec( @@ -936,40 +936,72 @@ def from_native(cls, string): """ if string == "*": return cls( - constraints=[VersionConstraint(comparator="*", version_class=cls.version_class)] + constraints=(VersionConstraint(comparator="*", version_class=cls.version_class),) ) - constraint_strings = string.split(",") constraints = [] + cleaned_string = remove_spaces(string).lower() + for version in cleaned_string.split(","): + if not version: + raise InvalidVersionRange(f"InvalidVersionRange : {string}") + + # wildcard + if "*" in version: + if "*" in version and not version.endswith("*") or constraints: + raise InvalidVersionRange( + f"Unsupported star in the middle of a version: it should be a trailing star only: {string}") + + if version.endswith(".*.*"): + version = version.replace(".*.*", ".*") + + segments_count = len(version.split(".")) + lower_bound = cls.version_class(version.replace("*", "0")) + if segments_count == 2: + upper_bound = cls.version_class(str(lower_bound.next_major())) + elif segments_count == 3: + upper_bound = cls.version_class(str(lower_bound.next_minor())) + else: + raise InvalidVersionRange(f"Invalid version: not a semver version: {string}") - # caret - if string.startswith("^"): - string = string.replace("^", "=") + vstart = VersionConstraint(comparator=">=", version=lower_bound) + vend = VersionConstraint(comparator="<", version=upper_bound) + constraints.extend([vstart, vend]) - # tilde - if string.startswith("~"): - version = string.lstrip("~") - lower_bound = CargoVersion(version) - if lower_bound.minor == 0 and lower_bound.patch == 0: - upper_bound = CargoVersion(str(lower_bound.value.next_major())) - else: - upper_bound = CargoVersion(str(lower_bound.value.next_minor())) + # caret + elif version.startswith("^"): + version = version.lstrip("^") + upper_bound = None + lower_bound = cls.version_class(version) + if (lower_bound.major != 0 or version == "0") and version != "0.0": + upper_bound = cls.version_class(str(lower_bound.value.next_major())) + else: + if lower_bound.minor != 0 or version == "0.0": + upper_bound = cls.version_class(str(lower_bound.value.next_minor())) + elif lower_bound.patch != 0: + upper_bound = cls.version_class(str(lower_bound.value.next_patch())) - return cls( - constraints=( - VersionConstraint(comparator=">=", version=lower_bound), - VersionConstraint(comparator="<", version=upper_bound), - ) - ) + vstart = VersionConstraint(comparator=">=", version=lower_bound) + vend = VersionConstraint(comparator="<", version=upper_bound) + constraints.extend([vstart, vend]) + + # tilde + elif version.startswith("~"): + version = version.lstrip("~") + lower_bound = cls.version_class(version) + if lower_bound.minor == 0 and lower_bound.patch == 0: + upper_bound = cls.version_class(str(lower_bound.value.next_major())) + else: + upper_bound = cls.version_class(str(lower_bound.value.next_minor())) + + vstart = VersionConstraint(comparator=">=", version=lower_bound) + vend = VersionConstraint(comparator="<", version=upper_bound) + constraints.extend([vstart, vend]) - for constraint in constraint_strings: - if not constraint: - raise InvalidVersionRange else: - vs = VersionConstraint.split(string) - version = cls.version_class(vs[1]) - constraint = VersionConstraint(comparator=vs[0], version=version) + comparator, version = VersionConstraint.split(version) + constraint = VersionConstraint(comparator=comparator, version=cls.version_class(version)) constraints.append(constraint) + return cls(constraints=tuple(constraints)) diff --git a/tests/test_cargo_version_range.py b/tests/test_cargo_version_range.py index 4cab90b0..083b9a43 100644 --- a/tests/test_cargo_version_range.py +++ b/tests/test_cargo_version_range.py @@ -7,58 +7,102 @@ values = [ # https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html # caret - ["^1.2.3", [[["=", "1.2.3"]]], ["1.2.3"], ["1.2.4"]], + ["^1.2.3", [[]], ["1.2.3"], []], # tilde - ["~1.2.3", [[[">=", "1.2.3"], ["<", "1.3.0"]]], ["1.2.4"], ["2.0.1"]], - ["~1.2", [[[">=", "1.2.0"], ["<", "1.3.0"]]], ["1.2.5"], ["1.3.1"]], - [ - "~1", - [[[">=", "1.0.0"], ["<", "2.0.0"]]], - ["1.3.0", "1.8.1"], - ["2.1.0", "2.2"], - ], # tilde increment the major + ["~1.2.3", [[">=", "1.2.3"], ["<", "1.3.0"]], ["1.2.4"], ["2.0.1"]], + ["~1.2", [[">=", "1.2.0"], ["<", "1.3.0"]], ["1.2.5"], ["1.3.1"]], + ["~1", [[">=", "1.0.0"], ["<", "2.0.0"]], ["1.3.0", "1.8.1"], ["2.1.0", "2.2"]], # tilde increment the major # wildcard - ["*", [[[">=", "0.0.0"]]], ["1.0.0", "2.0.0"], []], - # ["1.*", [[[">=", "1.0.0"]]], ["1.0.0"], ["2", "1.0.1"]], - # ["1.2.*", [[[">=", "1.2.0"], ["<", "1.3.0"]]], ["1.2", "1.2.1"], ["2.1.0", "2.2"]], + ["*", [[">=", "0.0.0"]], ["1.0.0", "2.0.0"], []], + ["1.*", [], ["1.0.0"], ["2"]], + ["1.2.*", [[">=", "1.2.0"], ["<", "1.3.0"]], ["1.2", "1.2.1"], ["2.1.0", "2.2"]], + # https://github.com/dtolnay/semver/blob/master/tests/test_version_req.rs : + + # test_basic + # ["^1.0.0", [[]], ["1.0.0", "1.1.0", "1.0.1"], ["0.9.9", "0.10.0", "0.1.0", "1.0.0-pre", "1.0.1-pre"]], + + # test_exact ["=1.0.0", [["=", "1.0.0"]], ["1.0.0"], ["1.0.1", "0.9.9", "0.10.0", "0.1.0", "1.0.0-pre"]], ["=0.9.0", [["=", "0.9.0"]], ["0.9.0"], ["0.9.1", "1.9.0", "0.0.9", "0.9.0-pre"]], ["=0.0.2", [["=", "0.0.2"]], ["0.0.2"], ["0.0.1", "0.0.3", "0.0.2-pre"]], - [ - "=0.1.0-beta2.a", - [["=", "0.1.0-beta2.a"]], - ["0.1.0-beta2.a"], - ["0.9.1", "0.1.0", "0.1.1-beta2.a", "0.1.0-beta2"], - ], + ["=0.1.0-beta2.a", [["=", "0.1.0-beta2.a"]], ["0.1.0-beta2.a"], ["0.9.1", "0.1.0", "0.1.1-beta2.a", "0.1.0-beta2"]], + # https://github.com/dtolnay/semver/blob/master/tests/test_version_req.rs#L73 # ["=0.1.0+meta", [["=", "0.1.0+meta"]], ["0.1.0", "0.1.0+meta", "0.1.0+any"], []], - # ["<1.0.0", [["<", "1.0.0"]], ["0.1.0", "0.0.1"], ["1.0.0", "1.0.0-beta", "1.0.1", "0.9.9-alpha"]], - # [ - # "<= 2.1.0-alpha2", - # [["<", "2.1.0-alpha2"], ["=", "2.1.0-alpha2"]], - # ["2.1.0-alpha2", "2.1.0-alpha1", "2.0.0", "1.0.0"], - # ["2.1.0", "2.2.0-alpha1", "2.0.0-alpha2", "1.0.0-alpha2"], - # ], - # [">1.0.0-alpha, <1.0.0", [[[">", "2.1.0-alpha2"], ["<", "1.0.0"]]], ["1.0.0-beta"], []], - # [">1.0.0-alpha, <1.0", [[[">", "1.0.0-alpha"], ["<", "1.0"]]], ["1.0.0-beta"], []], - # [">1.0.0-alpha, <1", [[[">", "1.0.0-alpha"], ["<", "1"]]], ["1.0.0-beta"], []], - # [ - # ">=0.5.1-alpha3, <0.6", - # [[[">", "0.5.1-alpha3"], ["=", "0.5.1-alpha3"], ["<", "0.6"]]], - # ["0.5.1-alpha3", "0.5.1-alpha4", "0.5.1-beta", "0.5.1", "0.5.5"], - # ["0.5.1-alpha1", "0.5.2-alpha3", "0.5.5-pre", "0.5.0-pre"], - # ], - ["~1", [], ["1.0.0", "1.0.1", "1.1.1"], ["0.9.1", "2.9.0", "0.0.9"]], - ["~1.2", [], ["1.2.0", "1.2.1"], ["1.1.1", "1.3.0", "0.0.9"]], - ["~1.2.2", [], ["1.2.2", "1.2.4"], ["1.2.1", "1.9.0", "1.0.9", "2.0.1", "0.1.3"]], - # [ - # "~1.2.3-beta.2", - # [], - # ["1.2.3", "1.2.4", "1.2.3-beta.2", "1.2.3-beta.4"], - # ["1.3.3", "1.1.4", "1.2.3-beta.1", "1.2.4-beta.2"], - # ], + + # test_greater_than + # [">= 1.0.0", [[]], ["1.0.0", "2.0.0"], ["0.1.0", "0.0.1", "1.0.0-pre", "2.0.0-pre"]], + # [">= 2.1.0-alpha2", [[]], ["2.1.0-alpha2", "2.1.0-alpha3", "2.1.0", "3.0.0"], ["2.0.0", "2.1.0-alpha1", "2.0.0-alpha2", "3.0.0-alpha2"]], + + # test_less_than + # ["<1.0.0", [[]], ["0.1.0", "0.0.1"], ["1.0.0", "1.0.0-beta", "1.0.1", "0.9.9-alpha"]], + # ["<= 2.1.0-alpha2", [[]], ["2.1.0-alpha2", "2.1.0-alpha1", "2.0.0", "1.0.0"], ["2.1.0", "2.2.0-alpha1", "2.0.0-alpha2", "1.0.0-alpha2"]], + # [">1.0.0-alpha, <1.0.0", [[">", "2.1.0-alpha2"], ["<", "1.0.0"]], ["1.0.0-beta"], []], + # [">1.0.0-alpha, <1.0", [[">", "1.0.0-alpha"], ["<", "1.0"]]], ["1.0.0-beta"], []], + [">1.0.0-alpha, <1", [[">", "1.0.0-alpha"], ["<", "1"]], ["1.0.0-beta"], []], + + # test_multiple + ["> 0.0.9, <= 2.5.3", [[]], ["0.0.10", "1.0.0", "2.5.3"], ["0.0.8", "2.5.4"]], + # ["^0.3.0, ^0.4.0", [[]], [], ["0.0.8", "0.3.0", "0.4.0"]], + # ["<=0.2.0, >=0.5.0", [[]], [], ["0.0.8", "0.3.0", "0.5.1"]], + # ["^0.1.0, ^0.1.4, ^0.1.6", [[]], ["0.1.6", "0.1.9"], ["0.1.0", "0.1.4", "0.2.0"]], + # [">=0.5.1-alpha3, <0.6", [[[">", "0.5.1-alpha3"], ["=", "0.5.1-alpha3"], ["<", "0.6"]]], ["0.5.1-alpha3", "0.5.1-alpha4", "0.5.1-beta", "0.5.1", "0.5.5"], ["0.5.1-alpha1", "0.5.2-alpha3", "0.5.5-pre", "0.5.0-pre"]], + + # test_tilde + ["~1", [[]], ["1.0.0", "1.0.1", "1.1.1"], ["0.9.1", "2.9.0", "0.0.9"]], + ["~1.2", [[]], ["1.2.0", "1.2.1"], ["1.1.1", "1.3.0", "0.0.9"]], + ["~1.2.2", [[]], ["1.2.2", "1.2.4"], ["1.2.1", "1.9.0", "1.0.9", "2.0.1", "0.1.3"]], + # ["~1.2.3-beta.2", [[]], ["1.2.3", "1.2.4", "1.2.3-beta.2", "1.2.3-beta.4"], + # ["1.3.3", "1.1.4", "1.2.3-beta.1", "1.2.4-beta.2"]], + + # test_caret + # ["^1", [[]], ["1.1.2", "1.1.0", "1.2.1", "1.0.1"], + # ["0.9.1", "2.9.0", "0.1.4", "1.0.0-beta1", "0.1.0-alpha", "1.0.1-pre"]], + + ["^1.1", [[]], ["1.1.2", "1.1.0", "1.2.1"], + ["0.9.1", "2.9.0", "1.0.1", "0.1.4"]], + + # ["^1.1.2", [[]], ["1.1.2", "1.1.4", "1.2.1"], + # ["0.9.1", "2.9.0", "1.1.1", "0.0.1", "1.1.2-alpha1", "1.1.3-alpha1", "2.9.0-alpha1"]], + + # ["^0.1.2", [[]], ["0.1.2", "0.1.4"], + # ["0.9.1", "2.9.0", "1.1.1", "0.0.1", "0.1.2-beta", "0.1.3-alpha", "0.2.0-pre"]], + + # ["^0.5.1-alpha3", [[]], ["0.5.1-alpha3", "0.5.1-alpha4", "0.5.1-beta", "0.5.1", "0.5.5", ], + # ["0.5.1-alpha1", "0.5.2-alpha3", "0.5.5-pre", "0.5.0-pre", "0.6.0"]], + + ["^0.0.2", [[]], ["0.0.2"], + ["0.9.1", "2.9.0", "1.1.1", "0.0.1", "0.1.4"]], + + # ["^0.0", [[]], ["0.0.2", "0.0.0"], + # ["0.9.1", "2.9.0", "1.1.1", "0.0.1", "0.1.4"]], + + ["^0", [[]], ["0.9.1", "0.0.2", "0.0.0"], + ["2.9.0", "1.1.1"]], + + # ["^1.4.2-beta.5", [[]], ["1.4.2", "1.4.3", "1.4.2-beta.5", "1.4.2-beta.6", "1.4.2-c"], + # ["0.9.9", "2.0.0", "1.4.2-alpha", "1.4.2-beta.4", "1.4.3-beta.5"]], + + # test_wildcard + # https://github.com/dtolnay/semver/blob/master/tests/test_version_req.rs#L272 + # ["*", [[]], ["0.9.1", "2.9.0", "0.0.9", "1.0.1", "1.1.1"], + # ["1.0.0-pre"]], + + # ["1.*", [[]], ["1.2.0", "1.2.1", "1.1.1", "1.3.0"], + # ["0.0.9", "1.2.0-pre"]], + + # ["1.2.*", [[]], ["1.2.0", "1.2.2", "1.2.4"], + # ["1.9.0", "1.0.9", "2.0.1", "0.1.3", "1.2.2-pre"]], + + # test_pre + # ["=2.1.1-really.0", [[]], ["2.1.1-really.0"], []] + + # test_cargo3202 + ["0.*.*", [[]], ["0.5.0"], []] + ] + error_list = [ "> 0.1.0,", "> 0.3.0, ,", @@ -66,17 +110,17 @@ # "> 0.0.9 <= 2.5.3", # "=1.2.3 || =2.3.4", # "1.1 || =1.2.3", - # "6.* || 8.* || >= 10.*", + "6.* || 8.* || >= 10.*", # ">= >= 0.0.2", # ">== 0.0.2", # "a.0.0", # "1.0.0-", # ">=", - # "*.1", - # "1.*.1", - # ">=1.*.1", - # "*, 0.20.0-any", - # "0.20.0-any, *" "0.20.0-any, *, 1.0", + "*.1", + "1.*.1", + ">=1.*.1", + "*, 0.20.0-any", + "0.20.0-any, *" "0.20.0-any, *, 1.0", ] @@ -93,6 +137,6 @@ def test_range(version_range, conditions, versions_in, versions_out): def test_error(): - for i in error_list: + for version_range in error_list: with pytest.raises(InvalidVersionRange): - CargoVersionRange.from_native(i) + CargoVersionRange.from_native(version_range) From bb7a7fd694b9c733fffacb82cf879e57c8c10026 Mon Sep 17 00:00:00 2001 From: Keshav Priyadarshi Date: Wed, 3 Jan 2024 19:04:25 +0530 Subject: [PATCH 3/4] Fix code formatting Signed-off-by: Keshav Priyadarshi --- src/univers/version_range.py | 19 +++++++------ tests/test_cargo_version_range.py | 47 +++++++++++-------------------- 2 files changed, 27 insertions(+), 39 deletions(-) diff --git a/src/univers/version_range.py b/src/univers/version_range.py index 77b1ad82..36996e91 100644 --- a/src/univers/version_range.py +++ b/src/univers/version_range.py @@ -223,9 +223,9 @@ def __contains__(self, version): def __eq__(self, other): return ( - self.scheme == other.scheme - and self.version_class == other.version_class - and self.constraints == other.constraints + self.scheme == other.scheme + and self.version_class == other.version_class + and self.constraints == other.constraints ) @@ -355,9 +355,9 @@ def from_native(cls, string): ) else: if ( - constraint.endswith(".x") - or constraint.startswith("~") - or constraint.startswith("^") + constraint.endswith(".x") + or constraint.startswith("~") + or constraint.startswith("^") ): constraints.extend( get_npm_version_constraints_from_semver_npm_spec( @@ -949,7 +949,8 @@ def from_native(cls, string): if "*" in version: if "*" in version and not version.endswith("*") or constraints: raise InvalidVersionRange( - f"Unsupported star in the middle of a version: it should be a trailing star only: {string}") + f"Unsupported star in the middle of a version: it should be a trailing star only: {string}" + ) if version.endswith(".*.*"): version = version.replace(".*.*", ".*") @@ -999,7 +1000,9 @@ def from_native(cls, string): else: comparator, version = VersionConstraint.split(version) - constraint = VersionConstraint(comparator=comparator, version=cls.version_class(version)) + constraint = VersionConstraint( + comparator=comparator, version=cls.version_class(version) + ) constraints.append(constraint) return cls(constraints=tuple(constraints)) diff --git a/tests/test_cargo_version_range.py b/tests/test_cargo_version_range.py index 083b9a43..67ae0ee2 100644 --- a/tests/test_cargo_version_range.py +++ b/tests/test_cargo_version_range.py @@ -11,95 +11,80 @@ # tilde ["~1.2.3", [[">=", "1.2.3"], ["<", "1.3.0"]], ["1.2.4"], ["2.0.1"]], ["~1.2", [[">=", "1.2.0"], ["<", "1.3.0"]], ["1.2.5"], ["1.3.1"]], - ["~1", [[">=", "1.0.0"], ["<", "2.0.0"]], ["1.3.0", "1.8.1"], ["2.1.0", "2.2"]], # tilde increment the major + [ + "~1", + [[">=", "1.0.0"], ["<", "2.0.0"]], + ["1.3.0", "1.8.1"], + ["2.1.0", "2.2"], + ], # tilde increment the major # wildcard ["*", [[">=", "0.0.0"]], ["1.0.0", "2.0.0"], []], ["1.*", [], ["1.0.0"], ["2"]], ["1.2.*", [[">=", "1.2.0"], ["<", "1.3.0"]], ["1.2", "1.2.1"], ["2.1.0", "2.2"]], - # https://github.com/dtolnay/semver/blob/master/tests/test_version_req.rs : - # test_basic # ["^1.0.0", [[]], ["1.0.0", "1.1.0", "1.0.1"], ["0.9.9", "0.10.0", "0.1.0", "1.0.0-pre", "1.0.1-pre"]], - # test_exact ["=1.0.0", [["=", "1.0.0"]], ["1.0.0"], ["1.0.1", "0.9.9", "0.10.0", "0.1.0", "1.0.0-pre"]], ["=0.9.0", [["=", "0.9.0"]], ["0.9.0"], ["0.9.1", "1.9.0", "0.0.9", "0.9.0-pre"]], ["=0.0.2", [["=", "0.0.2"]], ["0.0.2"], ["0.0.1", "0.0.3", "0.0.2-pre"]], - ["=0.1.0-beta2.a", [["=", "0.1.0-beta2.a"]], ["0.1.0-beta2.a"], ["0.9.1", "0.1.0", "0.1.1-beta2.a", "0.1.0-beta2"]], + [ + "=0.1.0-beta2.a", + [["=", "0.1.0-beta2.a"]], + ["0.1.0-beta2.a"], + ["0.9.1", "0.1.0", "0.1.1-beta2.a", "0.1.0-beta2"], + ], # https://github.com/dtolnay/semver/blob/master/tests/test_version_req.rs#L73 # ["=0.1.0+meta", [["=", "0.1.0+meta"]], ["0.1.0", "0.1.0+meta", "0.1.0+any"], []], - # test_greater_than # [">= 1.0.0", [[]], ["1.0.0", "2.0.0"], ["0.1.0", "0.0.1", "1.0.0-pre", "2.0.0-pre"]], # [">= 2.1.0-alpha2", [[]], ["2.1.0-alpha2", "2.1.0-alpha3", "2.1.0", "3.0.0"], ["2.0.0", "2.1.0-alpha1", "2.0.0-alpha2", "3.0.0-alpha2"]], - # test_less_than # ["<1.0.0", [[]], ["0.1.0", "0.0.1"], ["1.0.0", "1.0.0-beta", "1.0.1", "0.9.9-alpha"]], # ["<= 2.1.0-alpha2", [[]], ["2.1.0-alpha2", "2.1.0-alpha1", "2.0.0", "1.0.0"], ["2.1.0", "2.2.0-alpha1", "2.0.0-alpha2", "1.0.0-alpha2"]], # [">1.0.0-alpha, <1.0.0", [[">", "2.1.0-alpha2"], ["<", "1.0.0"]], ["1.0.0-beta"], []], # [">1.0.0-alpha, <1.0", [[">", "1.0.0-alpha"], ["<", "1.0"]]], ["1.0.0-beta"], []], [">1.0.0-alpha, <1", [[">", "1.0.0-alpha"], ["<", "1"]], ["1.0.0-beta"], []], - # test_multiple ["> 0.0.9, <= 2.5.3", [[]], ["0.0.10", "1.0.0", "2.5.3"], ["0.0.8", "2.5.4"]], # ["^0.3.0, ^0.4.0", [[]], [], ["0.0.8", "0.3.0", "0.4.0"]], # ["<=0.2.0, >=0.5.0", [[]], [], ["0.0.8", "0.3.0", "0.5.1"]], # ["^0.1.0, ^0.1.4, ^0.1.6", [[]], ["0.1.6", "0.1.9"], ["0.1.0", "0.1.4", "0.2.0"]], # [">=0.5.1-alpha3, <0.6", [[[">", "0.5.1-alpha3"], ["=", "0.5.1-alpha3"], ["<", "0.6"]]], ["0.5.1-alpha3", "0.5.1-alpha4", "0.5.1-beta", "0.5.1", "0.5.5"], ["0.5.1-alpha1", "0.5.2-alpha3", "0.5.5-pre", "0.5.0-pre"]], - # test_tilde ["~1", [[]], ["1.0.0", "1.0.1", "1.1.1"], ["0.9.1", "2.9.0", "0.0.9"]], ["~1.2", [[]], ["1.2.0", "1.2.1"], ["1.1.1", "1.3.0", "0.0.9"]], ["~1.2.2", [[]], ["1.2.2", "1.2.4"], ["1.2.1", "1.9.0", "1.0.9", "2.0.1", "0.1.3"]], # ["~1.2.3-beta.2", [[]], ["1.2.3", "1.2.4", "1.2.3-beta.2", "1.2.3-beta.4"], # ["1.3.3", "1.1.4", "1.2.3-beta.1", "1.2.4-beta.2"]], - # test_caret # ["^1", [[]], ["1.1.2", "1.1.0", "1.2.1", "1.0.1"], # ["0.9.1", "2.9.0", "0.1.4", "1.0.0-beta1", "0.1.0-alpha", "1.0.1-pre"]], - - ["^1.1", [[]], ["1.1.2", "1.1.0", "1.2.1"], - ["0.9.1", "2.9.0", "1.0.1", "0.1.4"]], - + ["^1.1", [[]], ["1.1.2", "1.1.0", "1.2.1"], ["0.9.1", "2.9.0", "1.0.1", "0.1.4"]], # ["^1.1.2", [[]], ["1.1.2", "1.1.4", "1.2.1"], # ["0.9.1", "2.9.0", "1.1.1", "0.0.1", "1.1.2-alpha1", "1.1.3-alpha1", "2.9.0-alpha1"]], - # ["^0.1.2", [[]], ["0.1.2", "0.1.4"], # ["0.9.1", "2.9.0", "1.1.1", "0.0.1", "0.1.2-beta", "0.1.3-alpha", "0.2.0-pre"]], - # ["^0.5.1-alpha3", [[]], ["0.5.1-alpha3", "0.5.1-alpha4", "0.5.1-beta", "0.5.1", "0.5.5", ], # ["0.5.1-alpha1", "0.5.2-alpha3", "0.5.5-pre", "0.5.0-pre", "0.6.0"]], - - ["^0.0.2", [[]], ["0.0.2"], - ["0.9.1", "2.9.0", "1.1.1", "0.0.1", "0.1.4"]], - + ["^0.0.2", [[]], ["0.0.2"], ["0.9.1", "2.9.0", "1.1.1", "0.0.1", "0.1.4"]], # ["^0.0", [[]], ["0.0.2", "0.0.0"], # ["0.9.1", "2.9.0", "1.1.1", "0.0.1", "0.1.4"]], - - ["^0", [[]], ["0.9.1", "0.0.2", "0.0.0"], - ["2.9.0", "1.1.1"]], - + ["^0", [[]], ["0.9.1", "0.0.2", "0.0.0"], ["2.9.0", "1.1.1"]], # ["^1.4.2-beta.5", [[]], ["1.4.2", "1.4.3", "1.4.2-beta.5", "1.4.2-beta.6", "1.4.2-c"], # ["0.9.9", "2.0.0", "1.4.2-alpha", "1.4.2-beta.4", "1.4.3-beta.5"]], - # test_wildcard # https://github.com/dtolnay/semver/blob/master/tests/test_version_req.rs#L272 # ["*", [[]], ["0.9.1", "2.9.0", "0.0.9", "1.0.1", "1.1.1"], # ["1.0.0-pre"]], - # ["1.*", [[]], ["1.2.0", "1.2.1", "1.1.1", "1.3.0"], # ["0.0.9", "1.2.0-pre"]], - # ["1.2.*", [[]], ["1.2.0", "1.2.2", "1.2.4"], # ["1.9.0", "1.0.9", "2.0.1", "0.1.3", "1.2.2-pre"]], - # test_pre # ["=2.1.1-really.0", [[]], ["2.1.1-really.0"], []] - # test_cargo3202 - ["0.*.*", [[]], ["0.5.0"], []] - + ["0.*.*", [[]], ["0.5.0"], []], ] From ebf95ff909c33cfc49dedf4ead59472674d8b207 Mon Sep 17 00:00:00 2001 From: ziadhany Date: Wed, 3 Jan 2024 22:56:47 +0200 Subject: [PATCH 4/4] Uncommented all invalid test cases Add ABOUT file and NOTICE Signed-off-by: ziadhany --- tests/test_cargo_version.ABOUT | 5 + .../{test_cargo.py => test_cargo_version.py} | 0 tests/test_cargo_version_range.py | 167 ++++++++++++----- tests/test_cargo_version_range.py.ABOUT | 10 + tests/test_cargo_version_range1.py.NOTICE | 176 ++++++++++++++++++ tests/test_cargo_version_range2.py.NOTICE | 23 +++ 6 files changed, 337 insertions(+), 44 deletions(-) create mode 100644 tests/test_cargo_version.ABOUT rename tests/{test_cargo.py => test_cargo_version.py} (100%) create mode 100644 tests/test_cargo_version_range.py.ABOUT create mode 100644 tests/test_cargo_version_range1.py.NOTICE create mode 100644 tests/test_cargo_version_range2.py.NOTICE diff --git a/tests/test_cargo_version.ABOUT b/tests/test_cargo_version.ABOUT new file mode 100644 index 00000000..642121ff --- /dev/null +++ b/tests/test_cargo_version.ABOUT @@ -0,0 +1,5 @@ +about_resource: | + test_cargo_version_range.py + test_cargo_version.py + +download_url: https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html \ No newline at end of file diff --git a/tests/test_cargo.py b/tests/test_cargo_version.py similarity index 100% rename from tests/test_cargo.py rename to tests/test_cargo_version.py diff --git a/tests/test_cargo_version_range.py b/tests/test_cargo_version_range.py index 67ae0ee2..d5d6caf8 100644 --- a/tests/test_cargo_version_range.py +++ b/tests/test_cargo_version_range.py @@ -23,9 +23,19 @@ ["1.2.*", [[">=", "1.2.0"], ["<", "1.3.0"]], ["1.2", "1.2.1"], ["2.1.0", "2.2"]], # https://github.com/dtolnay/semver/blob/master/tests/test_version_req.rs : # test_basic - # ["^1.0.0", [[]], ["1.0.0", "1.1.0", "1.0.1"], ["0.9.9", "0.10.0", "0.1.0", "1.0.0-pre", "1.0.1-pre"]], + [ + "^1.0.0", + [[]], + ["1.0.0", "1.1.0", "1.0.1"], + ["0.9.9", "0.10.0", "0.1.0", "1.0.0-pre", "1.0.1-pre"], + ], # test_exact - ["=1.0.0", [["=", "1.0.0"]], ["1.0.0"], ["1.0.1", "0.9.9", "0.10.0", "0.1.0", "1.0.0-pre"]], + [ + "=1.0.0", + [["=", "1.0.0"]], + ["1.0.0"], + ["1.0.1", "0.9.9", "0.10.0", "0.1.0", "1.0.0-pre"], + ], ["=0.9.0", [["=", "0.9.0"]], ["0.9.0"], ["0.9.1", "1.9.0", "0.0.9", "0.9.0-pre"]], ["=0.0.2", [["=", "0.0.2"]], ["0.0.2"], ["0.0.1", "0.0.3", "0.0.2-pre"]], [ @@ -35,54 +45,123 @@ ["0.9.1", "0.1.0", "0.1.1-beta2.a", "0.1.0-beta2"], ], # https://github.com/dtolnay/semver/blob/master/tests/test_version_req.rs#L73 - # ["=0.1.0+meta", [["=", "0.1.0+meta"]], ["0.1.0", "0.1.0+meta", "0.1.0+any"], []], + ["=0.1.0+meta", [["=", "0.1.0+meta"]], ["0.1.0", "0.1.0+meta", "0.1.0+any"], []], # test_greater_than - # [">= 1.0.0", [[]], ["1.0.0", "2.0.0"], ["0.1.0", "0.0.1", "1.0.0-pre", "2.0.0-pre"]], - # [">= 2.1.0-alpha2", [[]], ["2.1.0-alpha2", "2.1.0-alpha3", "2.1.0", "3.0.0"], ["2.0.0", "2.1.0-alpha1", "2.0.0-alpha2", "3.0.0-alpha2"]], + [ + ">= 1.0.0", + [[]], + ["1.0.0", "2.0.0"], + ["0.1.0", "0.0.1", "1.0.0-pre", "2.0.0-pre"], + ], + [ + ">= 2.1.0-alpha2", + [[]], + ["2.1.0-alpha2", "2.1.0-alpha3", "2.1.0", "3.0.0"], + ["2.0.0", "2.1.0-alpha1", "2.0.0-alpha2", "3.0.0-alpha2"], + ], # test_less_than - # ["<1.0.0", [[]], ["0.1.0", "0.0.1"], ["1.0.0", "1.0.0-beta", "1.0.1", "0.9.9-alpha"]], - # ["<= 2.1.0-alpha2", [[]], ["2.1.0-alpha2", "2.1.0-alpha1", "2.0.0", "1.0.0"], ["2.1.0", "2.2.0-alpha1", "2.0.0-alpha2", "1.0.0-alpha2"]], - # [">1.0.0-alpha, <1.0.0", [[">", "2.1.0-alpha2"], ["<", "1.0.0"]], ["1.0.0-beta"], []], - # [">1.0.0-alpha, <1.0", [[">", "1.0.0-alpha"], ["<", "1.0"]]], ["1.0.0-beta"], []], + [ + "<1.0.0", + [[]], + ["0.1.0", "0.0.1"], + ["1.0.0", "1.0.0-beta", "1.0.1", "0.9.9-alpha"], + ], + [ + "<= 2.1.0-alpha2", + [[]], + ["2.1.0-alpha2", "2.1.0-alpha1", "2.0.0", "1.0.0"], + ["2.1.0", "2.2.0-alpha1", "2.0.0-alpha2", "1.0.0-alpha2"], + ], + [ + ">1.0.0-alpha, <1.0.0", + [[">", "2.1.0-alpha2"], ["<", "1.0.0"]], + ["1.0.0-beta"], + [], + ], + [">1.0.0-alpha, <1.0", [[">", "1.0.0-alpha"], ["<", "1.0"]], ["1.0.0-beta"], []], [">1.0.0-alpha, <1", [[">", "1.0.0-alpha"], ["<", "1"]], ["1.0.0-beta"], []], # test_multiple ["> 0.0.9, <= 2.5.3", [[]], ["0.0.10", "1.0.0", "2.5.3"], ["0.0.8", "2.5.4"]], - # ["^0.3.0, ^0.4.0", [[]], [], ["0.0.8", "0.3.0", "0.4.0"]], - # ["<=0.2.0, >=0.5.0", [[]], [], ["0.0.8", "0.3.0", "0.5.1"]], - # ["^0.1.0, ^0.1.4, ^0.1.6", [[]], ["0.1.6", "0.1.9"], ["0.1.0", "0.1.4", "0.2.0"]], - # [">=0.5.1-alpha3, <0.6", [[[">", "0.5.1-alpha3"], ["=", "0.5.1-alpha3"], ["<", "0.6"]]], ["0.5.1-alpha3", "0.5.1-alpha4", "0.5.1-beta", "0.5.1", "0.5.5"], ["0.5.1-alpha1", "0.5.2-alpha3", "0.5.5-pre", "0.5.0-pre"]], + ["^0.3.0, ^0.4.0", [[]], [], ["0.0.8", "0.3.0", "0.4.0"]], + ["<=0.2.0, >=0.5.0", [[]], [], ["0.0.8", "0.3.0", "0.5.1"]], + ["^0.1.0, ^0.1.4, ^0.1.6", [[]], ["0.1.6", "0.1.9"], ["0.1.0", "0.1.4", "0.2.0"]], + [ + ">=0.5.1-alpha3, <0.6", + [[[">", "0.5.1-alpha3"], ["=", "0.5.1-alpha3"], ["<", "0.6"]]], + ["0.5.1-alpha3", "0.5.1-alpha4", "0.5.1-beta", "0.5.1", "0.5.5"], + ["0.5.1-alpha1", "0.5.2-alpha3", "0.5.5-pre", "0.5.0-pre"], + ], # test_tilde ["~1", [[]], ["1.0.0", "1.0.1", "1.1.1"], ["0.9.1", "2.9.0", "0.0.9"]], ["~1.2", [[]], ["1.2.0", "1.2.1"], ["1.1.1", "1.3.0", "0.0.9"]], ["~1.2.2", [[]], ["1.2.2", "1.2.4"], ["1.2.1", "1.9.0", "1.0.9", "2.0.1", "0.1.3"]], - # ["~1.2.3-beta.2", [[]], ["1.2.3", "1.2.4", "1.2.3-beta.2", "1.2.3-beta.4"], - # ["1.3.3", "1.1.4", "1.2.3-beta.1", "1.2.4-beta.2"]], + [ + "~1.2.3-beta.2", + [[]], + ["1.2.3", "1.2.4", "1.2.3-beta.2", "1.2.3-beta.4"], + ["1.3.3", "1.1.4", "1.2.3-beta.1", "1.2.4-beta.2"], + ], # test_caret - # ["^1", [[]], ["1.1.2", "1.1.0", "1.2.1", "1.0.1"], - # ["0.9.1", "2.9.0", "0.1.4", "1.0.0-beta1", "0.1.0-alpha", "1.0.1-pre"]], + [ + "^1", + [[]], + ["1.1.2", "1.1.0", "1.2.1", "1.0.1"], + ["0.9.1", "2.9.0", "0.1.4", "1.0.0-beta1", "0.1.0-alpha", "1.0.1-pre"], + ], ["^1.1", [[]], ["1.1.2", "1.1.0", "1.2.1"], ["0.9.1", "2.9.0", "1.0.1", "0.1.4"]], - # ["^1.1.2", [[]], ["1.1.2", "1.1.4", "1.2.1"], - # ["0.9.1", "2.9.0", "1.1.1", "0.0.1", "1.1.2-alpha1", "1.1.3-alpha1", "2.9.0-alpha1"]], - # ["^0.1.2", [[]], ["0.1.2", "0.1.4"], - # ["0.9.1", "2.9.0", "1.1.1", "0.0.1", "0.1.2-beta", "0.1.3-alpha", "0.2.0-pre"]], - # ["^0.5.1-alpha3", [[]], ["0.5.1-alpha3", "0.5.1-alpha4", "0.5.1-beta", "0.5.1", "0.5.5", ], - # ["0.5.1-alpha1", "0.5.2-alpha3", "0.5.5-pre", "0.5.0-pre", "0.6.0"]], + [ + "^1.1.2", + [[]], + ["1.1.2", "1.1.4", "1.2.1"], + [ + "0.9.1", + "2.9.0", + "1.1.1", + "0.0.1", + "1.1.2-alpha1", + "1.1.3-alpha1", + "2.9.0-alpha1", + ], + ], + [ + "^0.1.2", + [[]], + ["0.1.2", "0.1.4"], + ["0.9.1", "2.9.0", "1.1.1", "0.0.1", "0.1.2-beta", "0.1.3-alpha", "0.2.0-pre"], + ], + [ + "^0.5.1-alpha3", + [[]], + [ + "0.5.1-alpha3", + "0.5.1-alpha4", + "0.5.1-beta", + "0.5.1", + "0.5.5", + ], + ["0.5.1-alpha1", "0.5.2-alpha3", "0.5.5-pre", "0.5.0-pre", "0.6.0"], + ], ["^0.0.2", [[]], ["0.0.2"], ["0.9.1", "2.9.0", "1.1.1", "0.0.1", "0.1.4"]], - # ["^0.0", [[]], ["0.0.2", "0.0.0"], - # ["0.9.1", "2.9.0", "1.1.1", "0.0.1", "0.1.4"]], + ["^0.0", [[]], ["0.0.2", "0.0.0"], ["0.9.1", "2.9.0", "1.1.1", "0.0.1", "0.1.4"]], ["^0", [[]], ["0.9.1", "0.0.2", "0.0.0"], ["2.9.0", "1.1.1"]], - # ["^1.4.2-beta.5", [[]], ["1.4.2", "1.4.3", "1.4.2-beta.5", "1.4.2-beta.6", "1.4.2-c"], - # ["0.9.9", "2.0.0", "1.4.2-alpha", "1.4.2-beta.4", "1.4.3-beta.5"]], + [ + "^1.4.2-beta.5", + [[]], + ["1.4.2", "1.4.3", "1.4.2-beta.5", "1.4.2-beta.6", "1.4.2-c"], + ["0.9.9", "2.0.0", "1.4.2-alpha", "1.4.2-beta.4", "1.4.3-beta.5"], + ], # test_wildcard # https://github.com/dtolnay/semver/blob/master/tests/test_version_req.rs#L272 - # ["*", [[]], ["0.9.1", "2.9.0", "0.0.9", "1.0.1", "1.1.1"], - # ["1.0.0-pre"]], - # ["1.*", [[]], ["1.2.0", "1.2.1", "1.1.1", "1.3.0"], - # ["0.0.9", "1.2.0-pre"]], - # ["1.2.*", [[]], ["1.2.0", "1.2.2", "1.2.4"], - # ["1.9.0", "1.0.9", "2.0.1", "0.1.3", "1.2.2-pre"]], + ["*", [[]], ["0.9.1", "2.9.0", "0.0.9", "1.0.1", "1.1.1"], ["1.0.0-pre"]], + ["1.*", [[]], ["1.2.0", "1.2.1", "1.1.1", "1.3.0"], ["0.0.9", "1.2.0-pre"]], + [ + "1.2.*", + [[]], + ["1.2.0", "1.2.2", "1.2.4"], + ["1.9.0", "1.0.9", "2.0.1", "0.1.3", "1.2.2-pre"], + ], # test_pre - # ["=2.1.1-really.0", [[]], ["2.1.1-really.0"], []] + ["=2.1.1-really.0", [[]], ["2.1.1-really.0"], []], # test_cargo3202 ["0.*.*", [[]], ["0.5.0"], []], ] @@ -91,16 +170,16 @@ error_list = [ "> 0.1.0,", "> 0.3.0, ,", - # "1.2.3 - 2.3.4", - # "> 0.0.9 <= 2.5.3", - # "=1.2.3 || =2.3.4", - # "1.1 || =1.2.3", + "1.2.3 - 2.3.4", + "> 0.0.9 <= 2.5.3", + "=1.2.3 || =2.3.4", + "1.1 || =1.2.3", "6.* || 8.* || >= 10.*", - # ">= >= 0.0.2", - # ">== 0.0.2", - # "a.0.0", - # "1.0.0-", - # ">=", + ">= >= 0.0.2", + ">== 0.0.2", + "a.0.0", + "1.0.0-", + ">=", "*.1", "1.*.1", ">=1.*.1", @@ -124,4 +203,4 @@ def test_range(version_range, conditions, versions_in, versions_out): def test_error(): for version_range in error_list: with pytest.raises(InvalidVersionRange): - CargoVersionRange.from_native(version_range) + CargoVersionRange.from_native(version_range) \ No newline at end of file diff --git a/tests/test_cargo_version_range.py.ABOUT b/tests/test_cargo_version_range.py.ABOUT new file mode 100644 index 00000000..25ce291e --- /dev/null +++ b/tests/test_cargo_version_range.py.ABOUT @@ -0,0 +1,10 @@ +about_resource: test_cargo_version_range.py +package_url: pkg:cargo/semver@1.0.21 +download_url: https://github.com/dtolnay/semver/blob/f9cc2df9415c880bd3610c2cdb6785ac7cad31ea/tests/test_version_req.rs +homepage_url: https://github.com/dtolnay/semver +license_expression: | + MIT + Apache-2.0 +notice_file: | + test_cargo_version_range1.py.NOTICE + test_cargo_version_range2.py.NOTICE \ No newline at end of file diff --git a/tests/test_cargo_version_range1.py.NOTICE b/tests/test_cargo_version_range1.py.NOTICE new file mode 100644 index 00000000..a7e77cb2 --- /dev/null +++ b/tests/test_cargo_version_range1.py.NOTICE @@ -0,0 +1,176 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS \ No newline at end of file diff --git a/tests/test_cargo_version_range2.py.NOTICE b/tests/test_cargo_version_range2.py.NOTICE new file mode 100644 index 00000000..468cd79a --- /dev/null +++ b/tests/test_cargo_version_range2.py.NOTICE @@ -0,0 +1,23 @@ +Permission is hereby granted, free of charge, to any +person obtaining a copy of this software and associated +documentation files (the "Software"), to deal in the +Software without restriction, including without +limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software +is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice +shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF +ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED +TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT +SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. \ No newline at end of file