diff --git a/README.rst b/README.rst index 90159655..c0a2802e 100644 --- a/README.rst +++ b/README.rst @@ -62,7 +62,7 @@ For each scheme, **univers** provides an implementation for: - converting a range back to its scheme-native range syntax and to the ``vers`` syntax. -**univers** implements ``vers``, an experimental unified and mostly universal +ma**univers** implements ``vers``, an experimental unified and mostly universal version range syntax. It can parse and convert an existing native version range strings to this unified syntax. For example, this means: diff --git a/docs/source/conf.py b/docs/source/conf.py index 74b8649c..cb65af03 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -28,7 +28,7 @@ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. extensions = [ -'sphinx.ext.intersphinx', + "sphinx.ext.intersphinx", ] # This points to aboutcode.readthedocs.io @@ -36,8 +36,11 @@ # Link was created at commit - https://github.com/nexB/aboutcode/commit/faea9fcf3248f8f198844fe34d43833224ac4a83 intersphinx_mapping = { - 'aboutcode': ('https://aboutcode.readthedocs.io/en/latest/', None), - 'scancode-workbench': ('https://scancode-workbench.readthedocs.io/en/develop/', None), + "aboutcode": ("https://aboutcode.readthedocs.io/en/latest/", None), + "scancode-workbench": ( + "https://scancode-workbench.readthedocs.io/en/develop/", + None, + ), } @@ -62,7 +65,7 @@ # so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ["_static"] -master_doc = 'index' +master_doc = "index" html_context = { "css_files": [ diff --git a/etc/scripts/utils_thirdparty.py b/etc/scripts/utils_thirdparty.py index 829cf8c0..281bf84f 100644 --- a/etc/scripts/utils_thirdparty.py +++ b/etc/scripts/utils_thirdparty.py @@ -1503,7 +1503,10 @@ def dists_from_paths_or_urls(cls, paths_or_urls): dists.append(dist) if TRACE_DEEP: print( - " ===> dists_from_paths_or_urls:", dist, "with URL:", dist.download_url + " ===> dists_from_paths_or_urls:", + dist, + "with URL:", + dist.download_url, ) except InvalidDistributionFilename: if TRACE_DEEP: diff --git a/src/univers/conan/version.py b/src/univers/conan/version.py index 9bd853b9..1fadca6b 100644 --- a/src/univers/conan/version.py +++ b/src/univers/conan/version.py @@ -212,4 +212,7 @@ def __lt__(self, other): else: return self._nonzero_items < other._nonzero_items else: # None of them is pre-release - return (self._nonzero_items, self._build) < (other._nonzero_items, other._build) + return (self._nonzero_items, self._build) < ( + other._nonzero_items, + other._build, + ) diff --git a/src/univers/debian.py b/src/univers/debian.py index e7ab6ba4..130a5f5a 100644 --- a/src/univers/debian.py +++ b/src/univers/debian.py @@ -256,7 +256,9 @@ def compare_strings(version1, version2): logger.debug("Comparing non-digit prefixes %r and %r ..", p1, p2) for c1, c2 in zip_longest(p1, p2, fillvalue=""): logger.debug( - "Performing lexical comparison between characters %r and %r ..", c1, c2 + "Performing lexical comparison between characters %r and %r ..", + c1, + c2, ) o1 = mapping.get(c1) o2 = mapping.get(c2) diff --git a/src/univers/version_range.py b/src/univers/version_range.py index 36996e91..2323fb18 100644 --- a/src/univers/version_range.py +++ b/src/univers/version_range.py @@ -751,7 +751,8 @@ def from_native(cls, string): comparator = ">" constraints.append( VersionConstraint( - comparator=comparator, version=cls.version_class(str(lower_bound)) + comparator=comparator, + version=cls.version_class(str(lower_bound)), ) ) @@ -762,7 +763,8 @@ def from_native(cls, string): comparator = "<" constraints.append( VersionConstraint( - comparator=comparator, version=cls.version_class(str(upper_bound)) + comparator=comparator, + version=cls.version_class(str(upper_bound)), ) ) diff --git a/src/univers/versions.py b/src/univers/versions.py index 561d7f58..7dd57c4b 100644 --- a/src/univers/versions.py +++ b/src/univers/versions.py @@ -488,18 +488,22 @@ def __lt__(self, other): if not isinstance(other, self.__class__): return NotImplemented # Check if versions have the same base, and `one and only one` of them is a pre-release. - if (self.major, self.minor, self.build) == (other.major, other.minor, other.build) and ( - self.is_prerelease() != other.is_prerelease() - ): + if (self.major, self.minor, self.build) == ( + other.major, + other.minor, + other.build, + ) and (self.is_prerelease() != other.is_prerelease()): return self.is_prerelease() return self.value.__lt__(other.value) def __gt__(self, other): if not isinstance(other, self.__class__): return NotImplemented - if (self.major, self.minor, self.build) == (other.major, other.minor, other.build) and ( - self.is_prerelease() != other.is_prerelease() - ): + if (self.major, self.minor, self.build) == ( + other.major, + other.minor, + other.build, + ) and (self.is_prerelease() != other.is_prerelease()): return other.is_prerelease() return self.value.__gt__(other.value) diff --git a/tests/nuget/test_nuget_floating_range.py b/tests/nuget/test_nuget_floating_range.py index 53e7c675..a3f5ba3c 100644 --- a/tests/nuget/test_nuget_floating_range.py +++ b/tests/nuget/test_nuget_floating_range.py @@ -46,7 +46,11 @@ def test_FloatRange_OutsideOfRange(): def test_FloatRange_OutsideOfRangeLower(): vrange = VersionRange("[1.0.*, 2.0.0)") - versions = [NuGetVersion("0.1.0"), NuGetVersion("0.2.0"), NuGetVersion("1.0.0-alpha.2")] + versions = [ + NuGetVersion("0.1.0"), + NuGetVersion("0.2.0"), + NuGetVersion("1.0.0-alpha.2"), + ] assert not vrange.FindBestMatch(versions) @@ -64,7 +68,11 @@ def test_FloatRange_OutsideOfRangeHigher(): def test_FloatRange_OutsideOfRangeOpen(): vrange = VersionRange("[1.0.*, )") - versions = [NuGetVersion("0.1.0"), NuGetVersion("0.2.0"), NuGetVersion("1.0.0-alpha.2")] + versions = [ + NuGetVersion("0.1.0"), + NuGetVersion("0.2.0"), + NuGetVersion("1.0.0-alpha.2"), + ] assert not vrange.FindBestMatch(versions) diff --git a/tests/nuget/test_nuget_version.py b/tests/nuget/test_nuget_version.py index 56882661..c5ec0741 100644 --- a/tests/nuget/test_nuget_version.py +++ b/tests/nuget/test_nuget_version.py @@ -16,7 +16,10 @@ ("1.2.3", "1.2.3"), ("1.2.3-alpha", "1.2.3-alpha"), ("1.2.3-X.y.3+Meta-2", "1.2.3-x.y.3+Meta-2"), - ("1.2.3-X.yZ.3.234.243.3242342+METADATA", "1.2.3-x.yz.3.234.243.3242342+METADATA"), + ( + "1.2.3-X.yZ.3.234.243.3242342+METADATA", + "1.2.3-x.yz.3.234.243.3242342+METADATA", + ), ("1.2.3-X.y3+0", "1.2.3-x.y3+0"), ("1.2.3-X+0", "1.2.3-x+0"), ("1.2.3+0", "1.2.3+0"), diff --git a/tests/nuget/test_nuget_version_range.py b/tests/nuget/test_nuget_version_range.py index 29424289..82f6b151 100644 --- a/tests/nuget/test_nuget_version_range.py +++ b/tests/nuget/test_nuget_version_range.py @@ -204,7 +204,10 @@ def test_ParseVersionRangeSingleDigit(): def test_VersionRange_Exact(): versionInfo = NugetVersionRange.from_native( - nuget.Version.from_string(4, 3, 0), True, nuget.Version.from_string(4, 3, 0), True + nuget.Version.from_string(4, 3, 0), + True, + nuget.Version.from_string(4, 3, 0), + True, ) assert versionInfo.Satisfies(nuget.Version.from_string("4.3.0")) diff --git a/tests/nuget/test_nuget_version_range_float_parsing.py b/tests/nuget/test_nuget_version_range_float_parsing.py index 0628d675..5324be4c 100644 --- a/tests/nuget/test_nuget_version_range_float_parsing.py +++ b/tests/nuget/test_nuget_version_range_float_parsing.py @@ -66,7 +66,9 @@ def test_VersionRangeFloatParsing_PrereleaseWithNumericOnlyLabelVerifyMinVersion ("1.0.0-0+0-0"), ], ) -def test_VersionRangeFloatParsing_PrereleaseWithNumericOnlyLabelVerifySatisfies(version): +def test_VersionRangeFloatParsing_PrereleaseWithNumericOnlyLabelVerifySatisfies( + version, +): vrange = NugetVersionRange.from_native("1.0.0-*") assert vrange.Satisfies(nuget.Version(version)) @@ -283,8 +285,16 @@ def test_VersionRangeFloatParsing_CorrectFloatRange(rangeString): ("1.1.0;1.2.0-rc.1;1.2.0-rc.2;2.0.0;3.0.0-beta.1", "*-*", "3.0.0-beta.1"), ("1.1.0;1.2.0-rc.1;1.2.0-rc.2;2.0.0;3.0.0-beta.1", "1.*-*", "1.2.0-rc.2"), ("1.1.0;1.2.0-rc.1;1.2.0-rc.2;2.0.0;3.0.0-beta.1", "*-rc.*", "2.0.0"), - ("1.1.0;1.2.0-rc.1;1.2.0-rc.2;1.2.0-rc1;2.0.0;3.0.0-beta.1", "1.*-rc*", "1.2.0-rc1"), - ("1.1.0;1.2.0-rc.1;1.2.0-rc.2;1.2.0-rc1;1.10.0;2.0.0;3.0.0-beta.1", "1.1*-*", "1.10.0"), + ( + "1.1.0;1.2.0-rc.1;1.2.0-rc.2;1.2.0-rc1;2.0.0;3.0.0-beta.1", + "1.*-rc*", + "1.2.0-rc1", + ), + ( + "1.1.0;1.2.0-rc.1;1.2.0-rc.2;1.2.0-rc1;1.10.0;2.0.0;3.0.0-beta.1", + "1.1*-*", + "1.10.0", + ), ], ) def test_VersionRangeFloatParsing_FindsBestMatch(availableVersions, declaredRange, expectedVersion): diff --git a/tests/test_cargo_version.ABOUT b/tests/test_cargo_version.ABOUT new file mode 100644 index 00000000..00a1d7b1 --- /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 diff --git a/tests/test_cargo.py b/tests/test_cargo_version.py similarity index 97% rename from tests/test_cargo.py rename to tests/test_cargo_version.py index de186864..80ef0582 100644 --- a/tests/test_cargo.py +++ b/tests/test_cargo_version.py @@ -98,7 +98,12 @@ def test_compare(): version_list, ) def test_cargo( - version, expected_major, expected_minor, expected_patch, expected_prerelease, expected_build + 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) diff --git a/tests/test_cargo_version_range.py b/tests/test_cargo_version_range.py index 67ae0ee2..46b29f0c 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", diff --git a/tests/test_cargo_version_range.py.ABOUT b/tests/test_cargo_version_range.py.ABOUT new file mode 100644 index 00000000..ed24a90b --- /dev/null +++ b/tests/test_cargo_version_range.py.ABOUT @@ -0,0 +1,11 @@ +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 + diff --git a/tests/test_cargo_version_range1.py.NOTICE b/tests/test_cargo_version_range1.py.NOTICE new file mode 100644 index 00000000..468cd79a --- /dev/null +++ b/tests/test_cargo_version_range1.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 diff --git a/tests/test_cargo_version_range2.py.NOTICE b/tests/test_cargo_version_range2.py.NOTICE new file mode 100644 index 00000000..1b5ec8b7 --- /dev/null +++ b/tests/test_cargo_version_range2.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 diff --git a/tests/test_conan_version_range.py b/tests/test_conan_version_range.py index 1bf7e69f..a2980507 100644 --- a/tests/test_conan_version_range.py +++ b/tests/test_conan_version_range.py @@ -16,12 +16,27 @@ [">1 <2.0", [[[">", "1"], ["<", "2.0"]]], ["1.5.1"], ["0.1", "2.1"]], # tilde ["~2.5", [[[">=", "2.5"], ["<", "2.6-"]]], ["2.5.0", "2.5.3"], ["2.7", "2.6.1"]], - ["~2.5.1", [[[">=", "2.5.1"], ["<", "2.6.0-"]]], ["2.5.1", "2.5.3"], ["2.5", "2.6.1"]], + [ + "~2.5.1", + [[[">=", "2.5.1"], ["<", "2.6.0-"]]], + ["2.5.1", "2.5.3"], + ["2.5", "2.6.1"], + ], ["~1", [[[">=", "1"], ["<", "2-"]]], ["1.3", "1.8.1"], ["0.8", "2.2"]], # caret ["^1.2", [[[">=", "1.2"], ["<", "2.0-"]]], ["1.2.1", "1.51"], ["1", "2", "2.0.1"]], - ["^1.2.3", [[[">=", "1.2.3"], ["<", "2.0.0-"]]], ["1.2.3", "1.2.4"], ["2", "2.1", "2.0.1"]], - ["^0.1.2", [[[">=", "0.1.2"], ["<", "0.2.0-"]]], ["0.1.3", "0.1.44"], ["1", "0.3", "0.2.1"]], + [ + "^1.2.3", + [[[">=", "1.2.3"], ["<", "2.0.0-"]]], + ["1.2.3", "1.2.4"], + ["2", "2.1", "2.0.1"], + ], + [ + "^0.1.2", + [[[">=", "0.1.2"], ["<", "0.2.0-"]]], + ["0.1.3", "0.1.44"], + ["1", "0.3", "0.2.1"], + ], # Identity ["1.0.0", [[["=", "1.0.0"]]], ["1.0.0"], ["2", "1.0.1"]], ["=1.0.0", [[["=", "1.0.0"]]], ["1.0.0"], ["2", "1.0.1"]], @@ -29,7 +44,12 @@ ["*", [[[">=", "0.0.0"]]], ["1.0", "a.b"], []], ["", [[[">=", "0.0.0"]]], ["1.0", "a.b"], []], # Unions - ["1.0.0 || 2.1.3", [[["=", "1.0.0"]], [["=", "2.1.3"]]], ["1.0.0", "2.1.3"], ["2", "1.0.1"]], + [ + "1.0.0 || 2.1.3", + [[["=", "1.0.0"]], [["=", "2.1.3"]]], + ["1.0.0", "2.1.3"], + ["2", "1.0.1"], + ], [ ">1 <2.0 || ^3.2 ", [[[">", "1"], ["<", "2.0"]], [[">=", "3.2"], ["<", "4.0-"]]], @@ -47,8 +67,18 @@ ["1.5-a1", "3.3"], ["3.3-a1"], ], - ["^1.1.2-", [[[">=", "1.1.2"], ["<", "2.0.0-"]]], ["1.2.3", "1.2.0-alpha1"], ["2.0.0-alpha1"]], - ["~1.1.2-", [[[">=", "1.1.2"], ["<", "1.2.0-"]]], ["1.1.3", "1.1.3-alpha1"], ["1.2.0-alpha1"]], + [ + "^1.1.2-", + [[[">=", "1.1.2"], ["<", "2.0.0-"]]], + ["1.2.3", "1.2.0-alpha1"], + ["2.0.0-alpha1"], + ], + [ + "~1.1.2-", + [[[">=", "1.1.2"], ["<", "1.2.0-"]]], + ["1.1.3", "1.1.3-alpha1"], + ["1.2.0-alpha1"], + ], ] diff --git a/tests/test_gentoo.py b/tests/test_gentoo.py index eeabacbc..c5042d47 100644 --- a/tests/test_gentoo.py +++ b/tests/test_gentoo.py @@ -31,7 +31,8 @@ def testVerCmpGreater(self): ] for test in tests: self.assertFalse( - vercmp(test[0], test[1]) <= 0, msg="%s < %s? Wrong!" % (test[0], test[1]) + vercmp(test[0], test[1]) <= 0, + msg="%s < %s? Wrong!" % (test[0], test[1]), ) def testVerCmpLess(self): @@ -60,7 +61,8 @@ def testVerCmpLess(self): ] for test in tests: self.assertFalse( - vercmp(test[0], test[1]) >= 0, msg="%s > %s? Wrong!" % (test[0], test[1]) + vercmp(test[0], test[1]) >= 0, + msg="%s > %s? Wrong!" % (test[0], test[1]), ) def testVerCmpEqual(self): @@ -75,7 +77,8 @@ def testVerCmpEqual(self): ] for test in tests: self.assertFalse( - vercmp(test[0], test[1]) != 0, msg="%s != %s? Wrong!" % (test[0], test[1]) + vercmp(test[0], test[1]) != 0, + msg="%s != %s? Wrong!" % (test[0], test[1]), ) def testVerNotEqual(self): @@ -97,5 +100,6 @@ def testVerNotEqual(self): ] for test in tests: self.assertFalse( - vercmp(test[0], test[1]) == 0, msg="%s == %s? Wrong!" % (test[0], test[1]) + vercmp(test[0], test[1]) == 0, + msg="%s == %s? Wrong!" % (test[0], test[1]), ) diff --git a/tests/test_maven_version.py b/tests/test_maven_version.py index 97d25585..17f2b738 100644 --- a/tests/test_maven_version.py +++ b/tests/test_maven_version.py @@ -240,7 +240,11 @@ def test_from_string(self): for test, expected in test_pairs: v = Version(test) - assert v._parsed == expected, "Version(%s) == %s, want %s" % (test, v._parsed, expected) + assert v._parsed == expected, "Version(%s) == %s, want %s" % ( + test, + v._parsed, + expected, + ) def test_version_qualifiers(self): version_qualifiers = ( @@ -622,7 +626,11 @@ def test_compare(self): def test_str(self): for inp in ("[1.0,2.0]", "1.0"): actual = str(VersionRange(inp)) - assert inp == actual, "VersionRange(%s) == %s, wanted %s" % (inp, actual, inp) + assert inp == actual, "VersionRange(%s) == %s, wanted %s" % ( + inp, + actual, + inp, + ) def test_fromversion(self): v = Version("1.0") @@ -631,7 +639,13 @@ def test_fromversion(self): assert vr.version == v def test_match_versions(self): - versions = [Version("0.1"), Version("1.0"), Version("1.1"), Version("2.0"), Version("2.1")] + versions = [ + Version("0.1"), + Version("1.0"), + Version("1.1"), + Version("2.0"), + Version("2.1"), + ] vr = VersionRange("(1.0,2.0]") assert vr.match_version(versions) == "2.0" assert vr.match_version(versions[:3]) == "1.1"