Merge branch 'mr/fix_UP034_rule' into 'master'

Fix UP034 rule

See merge request it/e3-core!219

Author: liaiss

src/e3/anod/qualifiers_manager.py

@@ -135,7 +135,7 @@ def __init__(
 
         # Check that default value is valid
         if default is not None and choices is not None and default not in choices:
-            choices_str = ", ".join((f"'{choice}'" for choice in choices))
+            choices_str = ", ".join(f"'{choice}'" for choice in choices)
             raise AnodError(
                 f"{self.origin}: default value '{default}' "
                 f"should be in ({choices_str})."
@@ -162,7 +162,7 @@ def value(self, value: QualifierValue | None) -> QualifierValue:
             )
 
         if self.choices is not None and value not in self.choices:
-            choices_str = ", ".join((f"'{choice}'" for choice in self.choices))
+            choices_str = ", ".join(f"'{choice}'" for choice in self.choices)
             raise AnodError(
                 f"{self.origin}: Invalid value for qualifier {self.name}: '{value}' "
                 f"not in ({choices_str})"
@@ -276,9 +276,9 @@ def __init__(
         if default is not None and choices is not None:
             wrong_values = default - set(choices)
             if wrong_values:
-                choices_str = ", ".join((f"'{choice}'" for choice in choices))
+                choices_str = ", ".join(f"'{choice}'" for choice in choices)
                 wrong_values_str = ", ".join(
-                    (f"'{value}'" for value in sorted(wrong_values))
+                    f"'{value}'" for value in sorted(wrong_values)
                 )
                 raise AnodError(
                     f"{self.origin}: In '{self.name}', default value(s) "
@@ -314,7 +314,7 @@ def value(self, value: QualifierValue | None) -> QualifierValue:
             )
         else:
             try:
-                result = all((isinstance(el, str) for el in value))
+                result = all(isinstance(el, str) for el in value)
                 if not result:
                     raise AnodError(
                         f"{self.origin}: Invalid value for qualifier {self.name}: "
@@ -336,9 +336,9 @@ def value(self, value: QualifierValue | None) -> QualifierValue:
             wrong_values = value_set - set(self.choices)
 
             if wrong_values:
-                choices_str = ", ".join((f"'{choice}'" for choice in self.choices))
+                choices_str = ", ".join(f"'{choice}'" for choice in self.choices)
                 wrong_values_str = ", ".join(
-                    (f"'{value}'" for value in sorted(wrong_values))
+                    f"'{value}'" for value in sorted(wrong_values)
                 )
                 raise AnodError(
                     f"{self.origin}: Invalid value(s) for qualifier {self.name}: "
@@ -359,7 +359,7 @@ def repr(self, value: QualifierValue, hash_pool: list[str] | None) -> str:
             list_repr = []
             if not self.repr_omit_key:
                 list_repr.append(self.repr_name)
-            list_repr.extend((str(v) for v in sorted(value)))
+            list_repr.extend(str(v) for v in sorted(value))
 
             # And join them with a dash.
             str_repr = "-".join(list_repr)

src/e3/anod/store/__init__.py

@@ -2192,10 +2192,7 @@ def bulk_update_from_store(
         all_results = []
 
         for index, store_queries_chunk in enumerate(
-            (
-                queries_done[i : i + chunk_size]
-                for i in range(0, queries_num, chunk_size)
-            )
+            queries_done[i : i + chunk_size] for i in range(0, queries_num, chunk_size)
         ):
             start_time = time.time()
             logger.debug(f" Query chunk {index + 1}/{chunk_num}")

src/e3/diff.py

@@ -236,7 +236,7 @@ def write_line(line: str) -> None:
                     # This is the start of patch. Decide whether to discard it or
                     # not
                     path_list = [header1[1], header2[1]]
-                    discard = any((discard_patch(fn) for fn in path_list))
+                    discard = any(discard_patch(fn) for fn in path_list)
 
                     if not discard:
                         files_to_patch += 1
@@ -268,7 +268,7 @@ def process_git_patch() -> int:
                 if m is not None:
                     # This is the start of a git patch
                     path_list = [m.group(1), m.group(2)]
-                    discard = any((discard_patch(fn) for fn in path_list))
+                    discard = any(discard_patch(fn) for fn in path_list)
 
                     if not discard:
                         files_to_patch += 1

src/e3/python/pypi.py

@@ -494,11 +494,9 @@ def is_compatible_with_platforms(self, platform_list: list[str]) -> bool:
                 platforms_regex.append("win32")
 
             result = any(
-                (
-                    platform
-                    for platform in self.platform_tags
-                    if re.match("|".join(platforms_regex), platform)
-                )
+                platform
+                for platform in self.platform_tags
+                if re.match("|".join(platforms_regex), platform)
             )
         return result
 
@@ -513,11 +511,7 @@ def is_compatible_with_cpython3(self, minor_version: int) -> bool:
         else:
             result = (
                 any(
-                    (
-                        tag
-                        for tag in self.py_tags
-                        if tag in ("py3", f"cp3{minor_version}")
-                    )
+                    tag for tag in self.py_tags if tag in ("py3", f"cp3{minor_version}")
                 )
                 or "abi3" in self.abi_tags
             )
@@ -698,11 +692,9 @@ def file_closure(self) -> list[str]:
             # First check if there is a generic wheel present or no. If there is
             # one then there is no need to package the sources.
             has_generic_wheel = any(
-                (
-                    c
-                    for c in self.pypi.candidate_cache[canonicalize_name(req.name)]
-                    if c.is_generic_wheel and c.version in req.specifier
-                )
+                c
+                for c in self.pypi.candidate_cache[canonicalize_name(req.name)]
+                if c.is_generic_wheel and c.version in req.specifier
             )
 
             for candidate in self.pypi.candidate_cache[canonicalize_name(req.name)]:

tests/tests_e3/spdx_test.py

@@ -584,7 +584,7 @@ def test_misc_from_json_dict() -> None:
         PackageChecksum.from_json_dict({})
     with pytest.raises(ValueError, match="Unsupported checksum algorithm"):
         PackageChecksum.from_json_dict(
-            ({"algorithm": "invalid", "checksumValue": "not checked"})
+            {"algorithm": "invalid", "checksumValue": "not checked"}
         )
     homepage: PackageHomePage | None = PackageHomePage.from_json_dict(
         {PackageHomePage.get_json_entry_key(): "homepage"}