Skip to content

Commit 6419c1c

Browse files
KorulagKorulag
committed
Fixed black warnings #2 
1 parent 3fd43f8 commit 6419c1c

File tree

2 files changed

+63
-71
lines changed

2 files changed

+63
-71
lines changed

‎alws/crud/errata.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,8 @@ async def release_errata_packages(
977977
"module": rpm_module,
978978
"packages": dict_packages,
979979
}],
980-
"references": [{
980+
"references": [
981+
{
981982
"href": ref.href,
982983
"id": ref.ref_id,
983984
"title": ref.title,
@@ -1004,11 +1005,7 @@ async def prepare_updateinfo_mapping(
10041005
blacklist_updateinfo: List[str],
10051006
) -> DefaultDict[
10061007
str,
1007-
List[
1008-
Tuple[
1009-
models.BuildTaskArtifact, dict, models.NewErrataToALBSPackage
1010-
]
1011-
],
1008+
List[Tuple[models.BuildTaskArtifact, dict, models.NewErrataToALBSPackage]],
10121009
]:
10131010
updateinfo_mapping = collections.defaultdict(list)
10141011
for pkg_href in set(package_hrefs):
@@ -1073,7 +1070,9 @@ def append_update_packages_in_update_records(
10731070
updateinfo_mapping: DefaultDict[
10741071
str,
10751072
List[
1076-
Tuple[models.BuildTaskArtifact, dict, models.NewErrataToALBSPackage]
1073+
Tuple[
1074+
models.BuildTaskArtifact, dict, models.NewErrataToALBSPackage
1075+
]
10771076
],
10781077
],
10791078
):

‎alws/release_planner.py‎

Lines changed: 57 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -331,17 +331,15 @@ async def get_pulp_packages(
331331
for module in module_index.iter_modules():
332332
# in some cases we have also devel module in template,
333333
# we should add all modules from template
334-
modules_to_release[key].append(
335-
{
336-
"build_id": build.id,
337-
"name": module.name,
338-
"stream": module.stream,
339-
"version": module.version,
340-
"context": module.context,
341-
"arch": module.arch,
342-
"template": module.render(),
343-
}
344-
)
334+
modules_to_release[key].append({
335+
"build_id": build.id,
336+
"name": module.name,
337+
"stream": module.stream,
338+
"version": module.version,
339+
"context": module.context,
340+
"arch": module.arch,
341+
"template": module.render(),
342+
})
345343
pulp_rpm_modules = [
346344
module_dict
347345
for module_list in modules_to_release.values()
@@ -822,13 +820,11 @@ async def execute_release_plan(
822820
# for old module releases that have duplicated repos
823821
if release_module_nvsca in added_modules[full_repo_name]:
824822
continue
825-
module_already_in_repo = any(
826-
(
827-
prod_module
828-
for prod_module in repo_module_index.iter_modules()
829-
if prod_module.nsvca == release_module_nvsca
830-
)
831-
)
823+
module_already_in_repo = any((
824+
prod_module
825+
for prod_module in repo_module_index.iter_modules()
826+
if prod_module.nsvca == release_module_nvsca
827+
))
832828
if module_already_in_repo:
833829
additional_messages.append(
834830
f"Module {release_module_nvsca} skipped,"
@@ -847,18 +843,14 @@ async def execute_release_plan(
847843
)
848844
added_modules[full_repo_name].append(release_module_nvsca)
849845

850-
await asyncio.gather(
851-
*(
852-
self.pulp_client.modify_repository(href, add=packages)
853-
for href, packages in repository_modification_mapping.items()
854-
)
855-
)
856-
await asyncio.gather(
857-
*(
858-
self.pulp_client.create_rpm_publication(href)
859-
for href in repository_modification_mapping.keys()
860-
)
861-
)
846+
await asyncio.gather(*(
847+
self.pulp_client.modify_repository(href, add=packages)
848+
for href, packages in repository_modification_mapping.items()
849+
))
850+
await asyncio.gather(*(
851+
self.pulp_client.create_rpm_publication(href)
852+
for href in repository_modification_mapping.keys()
853+
))
862854
builds = await self.db.execute(
863855
select(models.Build).where(
864856
models.Build.id.in_(release.build_ids),
@@ -912,8 +904,12 @@ async def revert_release_plan(
912904
errata_pkgs = await self.db.execute(
913905
select(models.NewErrataToALBSPackage).where(
914906
or_(
915-
models.NewErrataToALBSPackage.albs_artifact_id.in_(subquery),
916-
models.NewErrataToALBSPackage.pulp_href.in_(pkgs_to_remove),
907+
models.NewErrataToALBSPackage.albs_artifact_id.in_(
908+
subquery
909+
),
910+
models.NewErrataToALBSPackage.pulp_href.in_(
911+
pkgs_to_remove
912+
),
917913
)
918914
)
919915
)
@@ -1036,13 +1032,11 @@ def get_devel_repo_key(
10361032
task_arch: str = "",
10371033
is_module: bool = False,
10381034
):
1039-
repo_name = "-".join(
1040-
(
1041-
self.clean_base_dist_name_lower,
1042-
self.base_platform.distr_version,
1043-
"devel-debuginfo" if is_debug else "devel",
1044-
)
1045-
)
1035+
repo_name = "-".join((
1036+
self.clean_base_dist_name_lower,
1037+
self.base_platform.distr_version,
1038+
"devel-debuginfo" if is_debug else "devel",
1039+
))
10461040
repo_arch = arch if arch == "src" else task_arch
10471041
if is_module:
10481042
repo_arch = arch
@@ -1102,13 +1096,11 @@ async def get_pulp_based_response(
11021096
repo_arch_location = [package_arch]
11031097
if package_arch == "noarch":
11041098
repo_arch_location = self.base_platform.arch_list
1105-
packages.append(
1106-
{
1107-
"package": package,
1108-
"repositories": [devel_repo],
1109-
"repo_arch_location": repo_arch_location,
1110-
}
1111-
)
1099+
packages.append({
1100+
"package": package,
1101+
"repositories": [devel_repo],
1102+
"repo_arch_location": repo_arch_location,
1103+
})
11121104
added_packages.add(full_name)
11131105
(
11141106
pkgs_from_repos,
@@ -1230,13 +1222,11 @@ def generate_key(beta: bool) -> BeholderKey:
12301222
# in cases if we try to find debug repos by non debug name
12311223
if is_debug and not repo_name.endswith("debuginfo"):
12321224
repo_name += "-debuginfo"
1233-
release_repo_name = "-".join(
1234-
(
1235-
self.clean_base_dist_name_lower,
1236-
self.base_platform.distr_version,
1237-
repo_name,
1238-
)
1239-
)
1225+
release_repo_name = "-".join((
1226+
self.clean_base_dist_name_lower,
1227+
self.base_platform.distr_version,
1228+
repo_name,
1229+
))
12401230
release_repo = RepoType(release_repo_name, repo["arch"], is_debug)
12411231
release_repositories.add((release_repo, trustness, matched))
12421232
return release_repositories
@@ -1320,7 +1310,9 @@ async def get_release_plan(
13201310
if module["arch"] in weak_arches:
13211311
module_arch_list.append(strong_arch)
13221312

1323-
platforms_list = base_platform.reference_platforms + [base_platform]
1313+
platforms_list = base_platform.reference_platforms + [
1314+
base_platform
1315+
]
13241316
module_responses = await self._beholder_client.retrieve_responses(
13251317
platforms_list,
13261318
module_name=module_name,
@@ -1363,13 +1355,11 @@ async def get_release_plan(
13631355
repo_name = self.repo_name_regex.search(
13641356
module_repo["name"]
13651357
).groupdict()["name"]
1366-
release_repo_name = "-".join(
1367-
(
1368-
self.clean_base_dist_name_lower,
1369-
base_platform.distr_version,
1370-
repo_name,
1371-
)
1372-
)
1358+
release_repo_name = "-".join((
1359+
self.clean_base_dist_name_lower,
1360+
base_platform.distr_version,
1361+
repo_name,
1362+
))
13731363
repo_key = RepoType(release_repo_name, module["arch"], False)
13741364
prod_repo = repos_mapping.get(repo_key)
13751365
if prod_repo is None:
@@ -1403,7 +1393,7 @@ async def get_release_plan(
14031393
platforms_list,
14041394
data={
14051395
"source_rpms": src_rpm_names,
1406-
"match": BeholderMatchMethod.all()
1396+
"match": BeholderMatchMethod.all(),
14071397
},
14081398
)
14091399

@@ -1756,7 +1746,8 @@ async def check_released_errata_packages(
17561746
if release.status != ReleaseStatus.COMPLETED:
17571747
return
17581748
package_hrefs = [
1759-
package["package"]["artifact_href"] for package in release.plan["packages"]
1749+
package["package"]["artifact_href"]
1750+
for package in release.plan["packages"]
17601751
]
17611752
subquery = (
17621753
select(models.BuildTaskArtifact.id)
@@ -1766,7 +1757,9 @@ async def check_released_errata_packages(
17661757
albs_pkgs = await self.db.execute(
17671758
select(models.NewErrataToALBSPackage).where(
17681759
or_(
1769-
models.NewErrataToALBSPackage.albs_artifact_id.in_(subquery),
1760+
models.NewErrataToALBSPackage.albs_artifact_id.in_(
1761+
subquery
1762+
),
17701763
models.NewErrataToALBSPackage.pulp_href.in_(package_hrefs),
17711764
)
17721765
)

0 commit comments

Comments
 (0)