From 3b3787ad118adbd203070d3179e0a7ae94f17c64 Mon Sep 17 00:00:00 2001 From: Chin Yeung Li Date: Tue, 20 Aug 2024 15:49:14 +0800 Subject: [PATCH] #140 - Apply black format Signed-off-by: Chin Yeung Li --- tests/test_conan_version_range.py | 24 +-- tests/test_debian_version.py | 15 +- ...est_debian_version_python_deb_pkg_tools.py | 3 +- tests/test_gentoo_pkgcore.py | 9 +- tests/test_maven_version.py | 15 +- tests/test_maven_version_range.py | 51 ++--- tests/test_openssl_versort.py | 3 +- tests/test_rpm_vercmp.py | 6 +- tests/test_version_range.py | 183 ++++++------------ tests/test_versions.py | 6 +- 10 files changed, 106 insertions(+), 209 deletions(-) diff --git a/tests/test_conan_version_range.py b/tests/test_conan_version_range.py index 73b22788..d2f75d41 100644 --- a/tests/test_conan_version_range.py +++ b/tests/test_conan_version_range.py @@ -15,18 +15,13 @@ ["<2.0", [[["<", "2.0"]]], ["1.0.1"], ["2.1"]], [">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", [[[">=", "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"]], ["~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", [[[">=", "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"]], # 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"]], @@ -34,8 +29,7 @@ ["*", [[[">=", "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-"]]], @@ -53,10 +47,8 @@ ["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_debian_version.py b/tests/test_debian_version.py index e04c1905..87ad95f7 100644 --- a/tests/test_debian_version.py +++ b/tests/test_debian_version.py @@ -91,8 +91,7 @@ def test_compare_strings(self): def test_compare_strings_can_sort(self): # taken from # http://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Version - result = sorted(["a", "", "~", "~~a", "~~"], - key=version.compare_strings_key) + result = sorted(["a", "", "~", "~~a", "~~"], key=version.compare_strings_key) expected = ["~~", "~~a", "~", "", "a"] assert expected == result @@ -152,10 +151,8 @@ def test_compare_versions(self): assert compare_versions("9.0.0", "10.0.0") == -1 assert compare_versions("1.2.3-1~deb7u1", "1.2.3-1") == -1 - assert compare_versions( - "2.7.4+reloaded2-13ubuntu1", "2.7.4+reloaded2-13+deb9u1") == -1 - assert compare_versions("2.7.4+reloaded2-13", - "2.7.4+reloaded2-13+deb9u1") == -1 + assert compare_versions("2.7.4+reloaded2-13ubuntu1", "2.7.4+reloaded2-13+deb9u1") == -1 + assert compare_versions("2.7.4+reloaded2-13", "2.7.4+reloaded2-13+deb9u1") == -1 # greater than assert compare_versions("0.0.1-0", "0:0.0.0") == 1 @@ -166,10 +163,8 @@ def test_compare_versions(self): assert compare_versions("9.0.0", "1.0.0") == 1 assert compare_versions("1.2.3-1", "1.2.3-1~deb7u1") == 1 - assert compare_versions( - "2.7.4+reloaded2-13+deb9u1", "2.7.4+reloaded2-13ubuntu1") == 1 - assert compare_versions( - "2.7.4+reloaded2-13+deb9u1", "2.7.4+reloaded2-13") == 1 + assert compare_versions("2.7.4+reloaded2-13+deb9u1", "2.7.4+reloaded2-13ubuntu1") == 1 + assert compare_versions("2.7.4+reloaded2-13+deb9u1", "2.7.4+reloaded2-13") == 1 # unicode assert compare_versions("2:0.0.44-1", "2:0.0.44-nobin") == -1 diff --git a/tests/test_debian_version_python_deb_pkg_tools.py b/tests/test_debian_version_python_deb_pkg_tools.py index 6c225dfc..05fb0cc5 100644 --- a/tests/test_debian_version_python_deb_pkg_tools.py +++ b/tests/test_debian_version_python_deb_pkg_tools.py @@ -16,8 +16,7 @@ def test_version_sorting(self): # Check version sorting implemented on top of `=' and `<<' comparisons. expected_order = ["0.1", "0.5", "1.0", "2.0", "3.0", "1:0.4", "2:0.3"] assert list(sorted(expected_order)) != expected_order - result = [str(v) - for v in sorted(map(Version.from_string, expected_order))] + result = [str(v) for v in sorted(map(Version.from_string, expected_order))] assert result == expected_order def test_version_comparison(self): diff --git a/tests/test_gentoo_pkgcore.py b/tests/test_gentoo_pkgcore.py index 0d3a1519..cbd7eaa8 100644 --- a/tests/test_gentoo_pkgcore.py +++ b/tests/test_gentoo_pkgcore.py @@ -16,12 +16,10 @@ def generate_misc_sufs(): suf_nums = list(range(100)) shuffle(suf_nums) - good_sufs = simple_good_sufs + \ - [f"{x}{suf_nums.pop()}" for x in simple_good_sufs] + good_sufs = simple_good_sufs + [f"{x}{suf_nums.pop()}" for x in simple_good_sufs] l = len(good_sufs) - good_sufs = good_sufs + [good_sufs[x] + - good_sufs[l - x - 1] for x in range(l)] + good_sufs = good_sufs + [good_sufs[x] + good_sufs[l - x - 1] for x in range(l)] bad_sufs = ["_a", "_9", "_"] + [x + " " for x in simple_good_sufs] return good_sufs, bad_sufs @@ -65,8 +63,7 @@ def test_parse_version_and_revisions(self): v_r = parse_version_and_revision(version) expected_rev = rev.lstrip("-r") expected_rev = expected_rev and int(expected_rev) or 0 - assert v_r == ( - ver, expected_rev), f"Failed to parse: {version}" + assert v_r == (ver, expected_rev), f"Failed to parse: {version}" except Exception as e: raise Exception(f"Failed to parse: {version!r}") from e diff --git a/tests/test_maven_version.py b/tests/test_maven_version.py index f57561d7..c485867e 100644 --- a/tests/test_maven_version.py +++ b/tests/test_maven_version.py @@ -240,8 +240,7 @@ 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 = ( @@ -269,7 +268,7 @@ def test_version_qualifiers(self): "1-123", ) for idx, low in enumerate(version_qualifiers[:-1]): - for high in version_qualifiers[idx + 1:]: + for high in version_qualifiers[idx + 1 :]: self._assert_version_order(low, high) def test_version_numbers(self): @@ -301,7 +300,7 @@ def test_version_numbers(self): "11m", ) for idx, low in enumerate(version_numbers[:-1]): - for high in version_numbers[idx + 1:]: + for high in version_numbers[idx + 1 :]: self._assert_version_order(low, high) unicode_version_numbers = ( @@ -333,7 +332,7 @@ def test_version_numbers(self): "11m", ) for idx, low in enumerate(unicode_version_numbers[:-1]): - for high in unicode_version_numbers[idx + 1:]: + for high in unicode_version_numbers[idx + 1 :]: self._assert_version_order(low, high) def test_version_equality(self): @@ -623,8 +622,7 @@ 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") @@ -633,8 +631,7 @@ 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" diff --git a/tests/test_maven_version_range.py b/tests/test_maven_version_range.py index b49c67c9..0905d75a 100644 --- a/tests/test_maven_version_range.py +++ b/tests/test_maven_version_range.py @@ -13,10 +13,8 @@ def test_maven_version_range_from_native_with_lower_inclusive(): version_range = MavenVersionRange.from_native("[1.0.0,2.0.0)") assert version_range == MavenVersionRange( constraints=( - VersionConstraint( - comparator=">=", version=MavenVersion(string="1.0.0")), - VersionConstraint( - comparator="<", version=MavenVersion(string="2.0.0")), + VersionConstraint(comparator=">=", version=MavenVersion(string="1.0.0")), + VersionConstraint(comparator="<", version=MavenVersion(string="2.0.0")), ) ) @@ -25,10 +23,8 @@ def test_maven_version_range_from_native_with_nothing_inclusive(): version_range = MavenVersionRange.from_native(" ( 1.0.0 , 2.1.4 ) ") assert version_range == MavenVersionRange( constraints=( - VersionConstraint( - comparator=">", version=MavenVersion(string="1.0.0")), - VersionConstraint( - comparator="<", version=MavenVersion(string="2.1.4")), + VersionConstraint(comparator=">", version=MavenVersion(string="1.0.0")), + VersionConstraint(comparator="<", version=MavenVersion(string="2.1.4")), ) ) @@ -36,8 +32,7 @@ def test_maven_version_range_from_native_with_nothing_inclusive(): def test_maven_version_range_from_native_for_pinned_version(): version_range = MavenVersionRange.from_native("[1.0.0]") assert version_range == MavenVersionRange( - constraints=(VersionConstraint(comparator="=", - version=MavenVersion(string="1.0.0")),) + constraints=(VersionConstraint(comparator="=", version=MavenVersion(string="1.0.0")),) ) @@ -55,38 +50,26 @@ def test_maven_version_range_from_native_str_representation(): def test_maven_version_range_from_native_for_multiple_version_ranges(): - version_range = MavenVersionRange.from_native( - "[2.0,2.3.1] , [2.4.0,2.12.2) , [2.13.0,2.15.0)") + version_range = MavenVersionRange.from_native("[2.0,2.3.1] , [2.4.0,2.12.2) , [2.13.0,2.15.0)") assert version_range == MavenVersionRange( constraints=( - VersionConstraint( - comparator=">=", version=MavenVersion(string="2.0")), - VersionConstraint( - comparator="<=", version=MavenVersion(string="2.3.1")), - VersionConstraint( - comparator=">=", version=MavenVersion(string="2.4.0")), - VersionConstraint( - comparator="<", version=MavenVersion(string="2.12.2")), - VersionConstraint( - comparator=">=", version=MavenVersion(string="2.13.0")), - VersionConstraint( - comparator="<", version=MavenVersion(string="2.15.0")), + VersionConstraint(comparator=">=", version=MavenVersion(string="2.0")), + VersionConstraint(comparator="<=", version=MavenVersion(string="2.3.1")), + VersionConstraint(comparator=">=", version=MavenVersion(string="2.4.0")), + VersionConstraint(comparator="<", version=MavenVersion(string="2.12.2")), + VersionConstraint(comparator=">=", version=MavenVersion(string="2.13.0")), + VersionConstraint(comparator="<", version=MavenVersion(string="2.15.0")), ) ) def test_maven_version_range_from_native_for_multiple_pinned_versions_and_a_range(): - version_range = MavenVersionRange.from_native( - "[2.0] , [2.4.0] , [2.13.0,2.15.0)") + version_range = MavenVersionRange.from_native("[2.0] , [2.4.0] , [2.13.0,2.15.0)") assert version_range == MavenVersionRange( constraints=( - VersionConstraint( - comparator="=", version=MavenVersion(string="2.0")), - VersionConstraint( - comparator="=", version=MavenVersion(string="2.4.0")), - VersionConstraint( - comparator=">=", version=MavenVersion(string="2.13.0")), - VersionConstraint( - comparator="<", version=MavenVersion(string="2.15.0")), + VersionConstraint(comparator="=", version=MavenVersion(string="2.0")), + VersionConstraint(comparator="=", version=MavenVersion(string="2.4.0")), + VersionConstraint(comparator=">=", version=MavenVersion(string="2.13.0")), + VersionConstraint(comparator="<", version=MavenVersion(string="2.15.0")), ) ) diff --git a/tests/test_openssl_versort.py b/tests/test_openssl_versort.py index 300db84f..443c6f37 100644 --- a/tests/test_openssl_versort.py +++ b/tests/test_openssl_versort.py @@ -22,8 +22,7 @@ def test_openssl_version_sort(self): results = [OpensslVersion(x.strip()) for x in all_openssl_versions] results.sort() results = [version_to_dict(x) for x in results] - expected_file = self.get_test_loc( - "openssl_versort_expected.json", must_exist=False) + expected_file = self.get_test_loc("openssl_versort_expected.json", must_exist=False) util_tests.check_results_against_json(results, expected_file) diff --git a/tests/test_rpm_vercmp.py b/tests/test_rpm_vercmp.py index ad7f4554..3f2b1f36 100644 --- a/tests/test_rpm_vercmp.py +++ b/tests/test_rpm_vercmp.py @@ -76,8 +76,7 @@ def create_test_function(ver1, ver2, expected, name): def test_rpm_version(self): ver1_str = str(ver1).encode("utf-8") ver2_str = str(ver2).encode("utf-8") - print( - f"testing (ver1={ver1_str}, ver2={ver2_str}, expected=expected{expected}") + print(f"testing (ver1={ver1_str}, ver2={ver2_str}, expected=expected{expected}") result = vercmp.vercmp(ver1, ver2) if result != expected: assert result == (expected, ver1, ver2) @@ -93,8 +92,7 @@ def get_tests(): test_file = os.path.join(os.path.dirname(__file__), "data", "rpmvercmp.at") with io.open(test_file, encoding="utf-8") as rpmtests: - tests = list(parse_rpmvercmp_tests( - rpmtests, with_buggy_comparisons=True)) + tests = list(parse_rpmvercmp_tests(rpmtests, with_buggy_comparisons=True)) for test_count, (ver1, ver2, expected) in enumerate(tests, 1): name = f"test_rpm_version_{test_count}" yield create_test_function(ver1, ver2, expected, name) diff --git a/tests/test_version_range.py b/tests/test_version_range.py index e9479b61..2d3c4112 100644 --- a/tests/test_version_range.py +++ b/tests/test_version_range.py @@ -34,16 +34,14 @@ class TestVersionRange(TestCase): def test_VersionRange_afrom_string(self): version_range = VersionRange.from_string("vers:pypi/>0.0.2") assert version_range == PypiVersionRange( - constraints=[VersionConstraint( - comparator=">", version=PypiVersion(string="0.0.2"))] + constraints=[VersionConstraint(comparator=">", version=PypiVersion(string="0.0.2"))] ) def test_VersionRange_to_string(self): vers = "vers:pypi/0.0.2|0.0.6|>=0.0.0|0.0.1|0.0.4|0.0.5|0.0.3" version_range = VersionRange.from_string(vers) # note the sorting taking place - assert str( - version_range) == "vers:pypi/>=0.0.0|0.0.1|0.0.2|0.0.3|0.0.4|0.0.5|0.0.6" + assert str(version_range) == "vers:pypi/>=0.0.0|0.0.1|0.0.2|0.0.3|0.0.4|0.0.5|0.0.6" def test_VersionRange_pypi_does_not_contain_basic(self): vers = "vers:pypi/0.0.2|0.0.6|>=3.0.0|0.0.1|0.0.4|0.0.5|0.0.3" @@ -99,36 +97,25 @@ def test_VersionRange_from_string_pypi(self): assert version_range.scheme == "pypi" # note the sorting taking place expected = ( - VersionConstraint( - comparator="=", version=PypiVersion(string="0.0.0")), - VersionConstraint( - comparator="=", version=PypiVersion(string="0.0.1")), - VersionConstraint( - comparator="=", version=PypiVersion(string="0.0.2")), - VersionConstraint( - comparator="=", version=PypiVersion(string="0.0.3")), - VersionConstraint( - comparator="=", version=PypiVersion(string="0.0.4")), - VersionConstraint( - comparator="=", version=PypiVersion(string="0.0.5")), - VersionConstraint( - comparator="=", version=PypiVersion(string="0.0.6")), + VersionConstraint(comparator="=", version=PypiVersion(string="0.0.0")), + VersionConstraint(comparator="=", version=PypiVersion(string="0.0.1")), + VersionConstraint(comparator="=", version=PypiVersion(string="0.0.2")), + VersionConstraint(comparator="=", version=PypiVersion(string="0.0.3")), + VersionConstraint(comparator="=", version=PypiVersion(string="0.0.4")), + VersionConstraint(comparator="=", version=PypiVersion(string="0.0.5")), + VersionConstraint(comparator="=", version=PypiVersion(string="0.0.6")), ) assert version_range.constraints == expected # note the sorting taking place - assert str( - version_range) == "vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|0.0.4|0.0.5|0.0.6" + assert str(version_range) == "vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|0.0.4|0.0.5|0.0.6" - version_range1 = VersionRange.from_string( - vers, simplify=False, validate=True) + version_range1 = VersionRange.from_string(vers, simplify=False, validate=True) assert version_range1.constraints == expected - version_range2 = VersionRange.from_string( - vers, simplify=True, validate=False) + version_range2 = VersionRange.from_string(vers, simplify=True, validate=False) assert version_range2.constraints == expected - version_range3 = VersionRange.from_string( - vers, simplify=True, validate=True) + version_range3 = VersionRange.from_string(vers, simplify=True, validate=True) assert version_range3.constraints == expected def test_VersionRange_from_string_pypi_complex_simplify(self): @@ -140,90 +127,74 @@ def test_VersionRange_from_string_pypi_complex_simplify(self): raise Exception(f"Exception not raised: {vers}") except ValueError: pass - version_range = VersionRange.from_string( - vers, validate=True, simplify=True) + version_range = VersionRange.from_string(vers, validate=True, simplify=True) assert str(version_range) == "vers:pypi/>0.0.0|<0.0.5|>=0.0.6" def test_VersionRange_from_string_pypi_complex_simplify_and_validate(self): vers = "vers:pypi/>0.0.0|>=0.0.1|0.0.2|0.0.3|0.0.4|<0.0.5|>=0.0.6|!=0.8" version_range = VersionRange.from_string(vers, simplify=True) assert str(version_range) == "vers:pypi/>0.0.0|<0.0.5|>=0.0.6|!=0.8" - version_range = VersionRange.from_string( - vers, simplify=True, validate=True) + version_range = VersionRange.from_string(vers, simplify=True, validate=True) def test_VersionRange_from_string_pypi_complex_simplify2(self): vers = ( "vers:pypi/>0.0.0|>=0.0.1|>=0.0.1|0.0.2|0.0.3|0.0.4|<0.0.5|<=0.0.6|!=0.7|8.0|>12|<15.3" ) version_range = VersionRange.from_string(vers, simplify=True) - assert str( - version_range) == "vers:pypi/>0.0.0|<=0.0.6|!=0.7|8.0|>12|<15.3" + assert str(version_range) == "vers:pypi/>0.0.0|<=0.0.6|!=0.7|8.0|>12|<15.3" def test_VersionRange_from_string_pypi_simple_cases(self): vers = "vers:pypi/>0.0.1" - version_range = VersionRange.from_string( - vers, simplify=True, validate=True) + version_range = VersionRange.from_string(vers, simplify=True, validate=True) assert str(version_range) == vers vers = "vers:pypi/>=0.0.1" - version_range = VersionRange.from_string( - vers, simplify=True, validate=True) + version_range = VersionRange.from_string(vers, simplify=True, validate=True) assert str(version_range) == vers vers = "vers:pypi/<0.0.1" - version_range = VersionRange.from_string( - vers, simplify=True, validate=True) + version_range = VersionRange.from_string(vers, simplify=True, validate=True) assert str(version_range) == vers vers = "vers:pypi/<=0.0.1" - version_range = VersionRange.from_string( - vers, simplify=True, validate=True) + version_range = VersionRange.from_string(vers, simplify=True, validate=True) assert str(version_range) == vers vers = "vers:pypi/0.0.1" - version_range = VersionRange.from_string( - vers, simplify=True, validate=True) + version_range = VersionRange.from_string(vers, simplify=True, validate=True) assert str(version_range) == vers vers = "vers:pypi/!=0.0.1" - version_range = VersionRange.from_string( - vers, simplify=True, validate=True) + version_range = VersionRange.from_string(vers, simplify=True, validate=True) assert str(version_range) == vers vers = "vers:pypi/*" - version_range = VersionRange.from_string( - vers, simplify=True, validate=True) + version_range = VersionRange.from_string(vers, simplify=True, validate=True) assert str(version_range) == vers def test_VersionRange_from_string_pypi_two_cases(self): vers = "vers:pypi/>0.0.1|<0.1" - version_range = VersionRange.from_string( - vers, simplify=True, validate=True) + version_range = VersionRange.from_string(vers, simplify=True, validate=True) assert str(version_range) == vers vers = "vers:pypi/>=0.0.1|<0.1" - version_range = VersionRange.from_string( - vers, simplify=True, validate=True) + version_range = VersionRange.from_string(vers, simplify=True, validate=True) assert str(version_range) == vers vers = "vers:pypi/<0.0.1|>0.1" - version_range = VersionRange.from_string( - vers, simplify=True, validate=True) + version_range = VersionRange.from_string(vers, simplify=True, validate=True) assert str(version_range) == vers vers = "vers:pypi/<=0.0.1|>0.1" - version_range = VersionRange.from_string( - vers, simplify=True, validate=True) + version_range = VersionRange.from_string(vers, simplify=True, validate=True) assert str(version_range) == vers vers = "vers:pypi/0.0.1|>0.1" - version_range = VersionRange.from_string( - vers, simplify=True, validate=True) + version_range = VersionRange.from_string(vers, simplify=True, validate=True) assert str(version_range) == vers vers = "vers:pypi/!=0.0.1|>0.1" - version_range = VersionRange.from_string( - vers, simplify=True, validate=True) + version_range = VersionRange.from_string(vers, simplify=True, validate=True) assert str(version_range) == vers def test_GemVersionRange_from_native_range_with_pessimistic_operator(self): @@ -231,26 +202,21 @@ def test_GemVersionRange_from_native_range_with_pessimistic_operator(self): version_range = GemVersionRange.from_native(gem_range) assert version_range.to_string() == "vers:gem/>=2.0.8|<2.1" assert version_range.constraints == ( - VersionConstraint( - comparator=">=", version=RubygemsVersion(string="2.0.8")), - VersionConstraint( - comparator="<", version=RubygemsVersion(string="2.1")), + VersionConstraint(comparator=">=", version=RubygemsVersion(string="2.0.8")), + VersionConstraint(comparator="<", version=RubygemsVersion(string="2.1")), ) def test_VersionRange_contains_works_for_star_range(self): from univers.versions import NginxVersion - assert NginxVersion( - "1.0.0") in VersionRange.from_string("vers:nginx/*") + assert NginxVersion("1.0.0") in VersionRange.from_string("vers:nginx/*") def test_NpmVersionRange_from_native_with_compatible_with_version_operator(self): npm_range = "^1.2.9" expected = NpmVersionRange( constraints=( - VersionConstraint( - comparator=">=", version=SemverVersion(string="1.2.9")), - VersionConstraint( - comparator="<", version=SemverVersion(string="2.0.0")), + VersionConstraint(comparator=">=", version=SemverVersion(string="1.2.9")), + VersionConstraint(comparator="<", version=SemverVersion(string="2.0.0")), ) ) version_range = NpmVersionRange.from_native(npm_range) @@ -260,10 +226,8 @@ def test_NpmVersionRange_from_native_with_prerelease_carate_range(self): npm_range = "^1.2.3-beta.1" expected = NpmVersionRange( constraints=( - VersionConstraint( - comparator=">=", version=SemverVersion(string="1.2.3-beta.1")), - VersionConstraint( - comparator="<", version=SemverVersion(string="2.0.0")), + VersionConstraint(comparator=">=", version=SemverVersion(string="1.2.3-beta.1")), + VersionConstraint(comparator="<", version=SemverVersion(string="2.0.0")), ) ) version_range = NpmVersionRange.from_native(npm_range) @@ -273,10 +237,8 @@ def test_NpmVersionRange_from_native_with_prerelease_carate_range_wihtout_major( npm_range = "^0.2.1-beta" expected = NpmVersionRange( constraints=( - VersionConstraint( - comparator=">=", version=SemverVersion(string="0.2.1-beta")), - VersionConstraint( - comparator="<", version=SemverVersion(string="0.3.0")), + VersionConstraint(comparator=">=", version=SemverVersion(string="0.2.1-beta")), + VersionConstraint(comparator="<", version=SemverVersion(string="0.3.0")), ) ) version_range = NpmVersionRange.from_native(npm_range) @@ -286,10 +248,8 @@ def test_NpmVersionRange_from_native_with_prerelease_carate_range_wihtout_major_ npm_range = "^0.0.2-beta" expected = NpmVersionRange( constraints=( - VersionConstraint( - comparator=">=", version=SemverVersion(string="0.0.2-beta")), - VersionConstraint( - comparator="<", version=SemverVersion(string="0.0.3")), + VersionConstraint(comparator=">=", version=SemverVersion(string="0.0.2-beta")), + VersionConstraint(comparator="<", version=SemverVersion(string="0.0.3")), ) ) version_range = NpmVersionRange.from_native(npm_range) @@ -299,10 +259,8 @@ def test_NpmVersionRange_from_native_with_approximately_equal_to_operator(self): npm_range = "~3.8.2" expected = NpmVersionRange( constraints=( - VersionConstraint( - comparator=">=", version=SemverVersion(string="3.8.2")), - VersionConstraint( - comparator="<", version=SemverVersion(string="3.9.0")), + VersionConstraint(comparator=">=", version=SemverVersion(string="3.8.2")), + VersionConstraint(comparator="<", version=SemverVersion(string="3.9.0")), ) ) version_range = NpmVersionRange.from_native(npm_range) @@ -312,8 +270,7 @@ def test_OpensslVersionRange_from_native_single_legacy(self): openssl_range = "0.9.8j" expected = OpensslVersionRange( constraints=( - VersionConstraint( - comparator="=", version=OpensslVersion(string="0.9.8j")), + VersionConstraint(comparator="=", version=OpensslVersion(string="0.9.8j")), ) ) version_range = OpensslVersionRange.from_native(openssl_range) @@ -322,8 +279,7 @@ def test_OpensslVersionRange_from_native_single_legacy(self): def test_OpensslVersionRange_from_native_single_new_semver(self): openssl_range = "3.0.1" expected = OpensslVersionRange( - constraints=(VersionConstraint(comparator="=", - version=OpensslVersion(string="3.0.1")),) + constraints=(VersionConstraint(comparator="=", version=OpensslVersion(string="3.0.1")),) ) version_range = OpensslVersionRange.from_native(openssl_range) assert version_range == expected @@ -332,10 +288,8 @@ def test_OpensslVersionRange_from_native_mixed(self): openssl_range = "3.0.0, 1.0.1b" expected = OpensslVersionRange( constraints=( - VersionConstraint( - comparator="=", version=OpensslVersion(string="1.0.1b")), - VersionConstraint( - comparator="=", version=OpensslVersion(string="3.0.0")), + VersionConstraint(comparator="=", version=OpensslVersion(string="1.0.1b")), + VersionConstraint(comparator="=", version=OpensslVersion(string="3.0.0")), ) ) version_range = OpensslVersionRange.from_native(openssl_range) @@ -345,16 +299,11 @@ def test_OpensslVersionRange_from_versions(self): sequence = ["3.0.0", "1.0.1b", "3.0.2", "0.9.7a ", "1.1.1ka"] expected = OpensslVersionRange( constraints=( - VersionConstraint( - comparator="=", version=OpensslVersion(string="0.9.7a")), - VersionConstraint( - comparator="=", version=OpensslVersion(string="1.0.1b")), - VersionConstraint( - comparator="=", version=OpensslVersion(string="1.1.1ka")), - VersionConstraint( - comparator="=", version=OpensslVersion(string="3.0.0")), - VersionConstraint( - comparator="=", version=OpensslVersion(string="3.0.2")), + VersionConstraint(comparator="=", version=OpensslVersion(string="0.9.7a")), + VersionConstraint(comparator="=", version=OpensslVersion(string="1.0.1b")), + VersionConstraint(comparator="=", version=OpensslVersion(string="1.1.1ka")), + VersionConstraint(comparator="=", version=OpensslVersion(string="3.0.0")), + VersionConstraint(comparator="=", version=OpensslVersion(string="3.0.2")), ) ) version_range = OpensslVersionRange.from_versions(sequence) @@ -364,10 +313,8 @@ def test_nuget_version_range(self): nuget_range = "[1.0.0, 2.0.0)" expected = NugetVersionRange( constraints=( - VersionConstraint( - comparator=">=", version=NugetVersion(string="1.0.0")), - VersionConstraint( - comparator="<", version=NugetVersion(string="2.0.0")), + VersionConstraint(comparator=">=", version=NugetVersion(string="1.0.0")), + VersionConstraint(comparator="<", version=NugetVersion(string="2.0.0")), ) ) version_range = NugetVersionRange.from_native(nuget_range) @@ -519,23 +466,18 @@ def test_conan_advisory_version_range_parse(test_case): def test_invert(): vers_with_equal_operator = VersionRange.from_string("vers:gem/1.0") assert str(vers_with_equal_operator.invert()) == "vers:gem/!=1.0" - assert VersionRange.from_string( - "vers:gem/!=1.0").invert() == vers_with_equal_operator + assert VersionRange.from_string("vers:gem/!=1.0").invert() == vers_with_equal_operator vers_with_less_than_operator = VersionRange.from_string("vers:gem/<1.0") assert str(vers_with_less_than_operator.invert()) == "vers:gem/>=1.0" - assert VersionRange.from_string( - "vers:gem/>=1.0").invert() == vers_with_less_than_operator + assert VersionRange.from_string("vers:gem/>=1.0").invert() == vers_with_less_than_operator vers_with_greater_than_operator = VersionRange.from_string("vers:gem/>1.0") assert str(vers_with_greater_than_operator.invert()) == "vers:gem/<=1.0" - assert VersionRange.from_string( - "vers:gem/<=1.0").invert() == vers_with_greater_than_operator + assert VersionRange.from_string("vers:gem/<=1.0").invert() == vers_with_greater_than_operator - vers_with_complex_constraints = VersionRange.from_string( - "vers:gem/<=1.0|>=3.0|<4.0|!=5.0") - assert str(vers_with_complex_constraints.invert() - ) == "vers:gem/>1.0|<3.0|>=4.0|5.0" + vers_with_complex_constraints = VersionRange.from_string("vers:gem/<=1.0|>=3.0|<4.0|!=5.0") + assert str(vers_with_complex_constraints.invert()) == "vers:gem/>1.0|<3.0|>=4.0|5.0" vers_with_star_operator = VersionRange.from_string("vers:gem/*") assert vers_with_star_operator.invert() == None @@ -580,8 +522,7 @@ def test_build_range_from_snyk_advisory_string_spaced(): def test_version_range_normalize_case1(): - known_versions = ["4.0.0", "3.0.0", "1.0.0", - "2.0.0", "1.3.0", "1.1.0", "1.2.0"] + known_versions = ["4.0.0", "3.0.0", "1.0.0", "2.0.0", "1.3.0", "1.1.0", "1.2.0"] vr = VersionRange.from_string("vers:pypi/<=1.1.0|>=1.2.0|<=1.3.0|3.0.0") nvr = vr.normalize(known_versions=known_versions) @@ -590,8 +531,7 @@ def test_version_range_normalize_case1(): def test_version_range_normalize_case2(): - known_versions = ["4.0.0", "3.0.0", "1.0.0", - "2.0.0", "1.3.0", "1.1.0", "1.2.0"] + known_versions = ["4.0.0", "3.0.0", "1.0.0", "2.0.0", "1.3.0", "1.1.0", "1.2.0"] vr = VersionRange.from_string("vers:pypi/<=1.3.0|3.0.0") nvr = vr.normalize(known_versions=known_versions) @@ -600,8 +540,7 @@ def test_version_range_normalize_case2(): def test_version_range_normalize_case3(): - known_versions = ["4.0.0", "3.0.0", "1.0.0", - "2.0.0", "1.3.0", "1.1.0", "1.2.0"] + known_versions = ["4.0.0", "3.0.0", "1.0.0", "2.0.0", "1.3.0", "1.1.0", "1.2.0"] vr = VersionRange.from_string("vers:pypi/<2.0.0|3.0.0") nvr = vr.normalize(known_versions=known_versions) diff --git a/tests/test_versions.py b/tests/test_versions.py index 71631307..57ded4c0 100644 --- a/tests/test_versions.py +++ b/tests/test_versions.py @@ -28,8 +28,7 @@ def test_version(): assert Version.is_valid("1.2.3") assert not Version.is_valid(None) assert Version.normalize("v1.2.3") == "1.2.3" - assert Version("1.2.3").satisfies(VersionConstraint( - comparator=">=", version=Version("1.2.3"))) + assert Version("1.2.3").satisfies(VersionConstraint(comparator=">=", version=Version("1.2.3"))) def test_pypi_version(): @@ -79,8 +78,7 @@ def test_semver_version(): assert version.next_patch() == SemverVersion("1.2.3") assert SemverVersion("1.2.3").next_patch() == SemverVersion("1.2.4") assert version.satisfies( - VersionConstraint( - comparator=">=", version=SemverVersion("1.2.3-pre.1+build.1")) + VersionConstraint(comparator=">=", version=SemverVersion("1.2.3-pre.1+build.1")) ) assert SemverVersion("1.0.0") == SemverVersion("1.0") assert SemverVersion("1.2.3+42") != SemverVersion("1.2.3+23")