Skip to content

Commit 2054d62

Browse files
authored
[pre-commit.ci] pre-commit autoupdate (#2703)
<!--pre-commit.ci start--> updates: - [github.com/astral-sh/ruff-pre-commit: v0.9.2 → v0.14.5](astral-sh/ruff-pre-commit@v0.9.2...v0.14.5) - [github.com/pre-commit/mirrors-mypy: v1.14.1 → v1.18.2](pre-commit/mirrors-mypy@v1.14.1...v1.18.2) - [github.com/pre-commit/pre-commit-hooks: v5.0.0 → v6.0.0](pre-commit/pre-commit-hooks@v5.0.0...v6.0.0) - [github.com/shellcheck-py/shellcheck-py: v0.10.0.1 → v0.11.0.1](shellcheck-py/shellcheck-py@v0.10.0.1...v0.11.0.1) - [github.com/packit/pre-commit-hooks: v1.2.0 → v1.3.0](packit/pre-commit-hooks@v1.2.0...v1.3.0) - [github.com/packit/requre: 0.8.4 → 0.9.1](packit/requre@0.8.4...0.9.1) - [github.com/gitleaks/gitleaks: v8.23.1 → v8.29.0](gitleaks/gitleaks@v8.23.1...v8.29.0) - [github.com/python-jsonschema/check-jsonschema: 0.31.0 → 0.35.0](python-jsonschema/check-jsonschema@0.31.0...0.35.0) <!--pre-commit.ci end-->
2 parents 5722d59 + bd60757 commit 2054d62

22 files changed

Lines changed: 111 additions & 111 deletions

.pre-commit-config.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
repos:
66
- repo: https://github.com/astral-sh/ruff-pre-commit
7-
rev: v0.9.2
7+
rev: v0.14.5
88
hooks:
99
- id: ruff
1010
args: [--fix, --exit-non-zero-on-fix]
1111
- id: ruff-format
1212
- repo: https://github.com/pre-commit/mirrors-mypy
13-
rev: v1.14.1
13+
rev: v1.18.2
1414
hooks:
1515
- id: mypy
1616
args: [
@@ -41,7 +41,7 @@ repos:
4141
- id: prettier
4242
exclude: tests_openshift/openshift_integration/test_data/
4343
- repo: https://github.com/pre-commit/pre-commit-hooks
44-
rev: v5.0.0
44+
rev: v6.0.0
4545
hooks:
4646
- id: check-added-large-files
4747
- id: check-ast
@@ -60,18 +60,18 @@ repos:
6060
- id: mixed-line-ending
6161
- id: trailing-whitespace
6262
- repo: https://github.com/shellcheck-py/shellcheck-py
63-
rev: v0.10.0.1
63+
rev: v0.11.0.1
6464
hooks:
6565
- id: shellcheck
6666
- repo: https://github.com/packit/pre-commit-hooks
67-
rev: v1.2.0
67+
rev: v1.3.0
6868
hooks:
6969
- id: check-rebase
7070
args:
7171
- https://github.com/packit/packit-service.git
7272
stages: [manual, pre-push]
7373
- repo: https://github.com/packit/requre
74-
rev: 0.8.4
74+
rev: 0.9.1
7575
hooks:
7676
- id: requre-purge
7777
name: Requre response files cleanup
@@ -96,14 +96,14 @@ repos:
9696
files: /tests_openshift.*\.yaml$
9797
stages: [manual, pre-push]
9898
- repo: https://github.com/gitleaks/gitleaks
99-
rev: v8.23.1
99+
rev: v8.29.0
100100
hooks:
101101
- id: gitleaks
102102
# The hook runs 'gitleaks protect --staged' which parses output of
103103
# 'git diff --staged', i.e. always passes in pre-push/manual stage.
104104
stages: [pre-commit]
105105
- repo: https://github.com/python-jsonschema/check-jsonschema
106-
rev: 0.31.0
106+
rev: 0.35.0
107107
hooks:
108108
- id: check-github-workflows
109109
args: ["--verbose"]

packit_service/worker/handlers/testing_farm.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ def run_with_copr_builds(self, targets: list[str], failed: dict):
249249
if not targets_with_builds:
250250
return
251251

252-
group, test_runs = self._get_or_create_group(targets_with_builds)
252+
_, test_runs = self._get_or_create_group(targets_with_builds)
253253
for test_run in test_runs:
254254
copr_build = test_run.copr_builds[0]
255255
if copr_build.status in (
@@ -326,8 +326,8 @@ def run(self) -> TaskResults:
326326
failed: dict[str, str] = {}
327327

328328
if self.testing_farm_job_helper.skip_build:
329-
group, test_runs = self._get_or_create_group(
330-
{target: None for target in targets},
329+
_, test_runs = self._get_or_create_group(
330+
dict.fromkeys(targets),
331331
)
332332
for test_run in test_runs:
333333
# Only retry what's needed
@@ -467,7 +467,7 @@ def run(self) -> TaskResults:
467467
self.service_config, self.project, self.data
468468
)
469469

470-
group, test_runs = self._get_or_create_group(fedora_ci_tests)
470+
_, test_runs = self._get_or_create_group(fedora_ci_tests)
471471
for test_run in test_runs:
472472
# Only retry what's needed
473473
if test_run.status not in [

packit_service/worker/reporting/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@
2525
StatusReporterGithubStatuses.__name__,
2626
StatusReporterGitlab.__name__,
2727
create_issue_if_needed.__name__,
28-
comment_without_duplicating,
28+
comment_without_duplicating.__name__,
2929
]

tests/integration/test_bodhi_update.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ def test_bodhi_update_for_unknown_koji_build(koji_build_completed_old_format):
142142
# 1*CreateBodhiUpdateHandler + 1*KojiBuildReportHandler
143143
assert len(processing_results) == 2
144144
processing_results.pop()
145-
event_dict, job, job_config, package_config = get_parameters_from_results(
145+
event_dict, _, job_config, package_config = get_parameters_from_results(
146146
processing_results,
147147
)
148148
assert json.dumps(event_dict)
@@ -247,7 +247,7 @@ def test_bodhi_update_for_unknown_koji_build_failed(koji_build_completed_old_for
247247
# 1*CreateBodhiUpdateHandler + 1*KojiBuildReportHandler
248248
assert len(processing_results) == 2
249249
processing_results.pop()
250-
event_dict, job, job_config, package_config = get_parameters_from_results(
250+
event_dict, _, job_config, package_config = get_parameters_from_results(
251251
processing_results,
252252
)
253253
with pytest.raises(PackitException):
@@ -358,7 +358,7 @@ def test_bodhi_update_for_unknown_koji_build_failed_issue_created(
358358
# 1*CreateBodhiUpdateHandler + 1*KojiBuildReportHandler
359359
assert len(processing_results) == 2
360360
processing_results.pop()
361-
event_dict, job, job_config, package_config = get_parameters_from_results(
361+
event_dict, _, job_config, package_config = get_parameters_from_results(
362362
processing_results,
363363
)
364364
CreateBodhiUpdateHandler(
@@ -483,7 +483,7 @@ def test_bodhi_update_for_unknown_koji_build_failed_issue_comment(
483483
# 1*CreateBodhiUpdateHandler + 1*KojiBuildReportHandler
484484
assert len(processing_results) == 2
485485
processing_results.pop()
486-
event_dict, job, job_config, package_config = get_parameters_from_results(
486+
event_dict, _, job_config, package_config = get_parameters_from_results(
487487
processing_results,
488488
)
489489
CreateBodhiUpdateHandler(
@@ -598,7 +598,7 @@ def test_bodhi_update_build_not_tagged_yet(
598598
# 1*CreateBodhiUpdateHandler + 1*KojiBuildReportHandler
599599
assert len(processing_results) == 2
600600
processing_results.pop()
601-
event_dict, job, job_config, package_config = get_parameters_from_results(
601+
event_dict, _, job_config, package_config = get_parameters_from_results(
602602
processing_results,
603603
)
604604
celery_task = flexmock(CeleryTask)
@@ -791,7 +791,7 @@ def test_bodhi_update_for_known_koji_build(koji_build_completed_old_format):
791791
# 1*CreateBodhiUpdateHandler + 1*KojiBuildReportHandler
792792
assert len(processing_results) == 2
793793
processing_results.pop()
794-
event_dict, job, job_config, package_config = get_parameters_from_results(
794+
event_dict, _, job_config, package_config = get_parameters_from_results(
795795
processing_results,
796796
)
797797
assert json.dumps(event_dict)
@@ -943,7 +943,7 @@ def test_bodhi_update_fedora_stable_by_default(koji_build_completed_f36):
943943
# 1*CreateBodhiUpdateHandler + 1*KojiBuildReportHandler
944944
assert len(processing_results) == 2
945945
processing_results.pop()
946-
event_dict, job, job_config, package_config = get_parameters_from_results(
946+
event_dict, _, job_config, package_config = get_parameters_from_results(
947947
processing_results,
948948
)
949949
assert json.dumps(event_dict)
@@ -1190,7 +1190,7 @@ def _create(target, koji_nvrs, sidetag, status, bodhi_update_group):
11901190
flexmock(BodhiUpdateTargetModel).should_receive("create").replace_with(_create)
11911191

11921192
processing_results = SteveJobs().process_message(koji_build_tagged)
1193-
event_dict, job, job_config, package_config = get_parameters_from_results(
1193+
event_dict, _, job_config, package_config = get_parameters_from_results(
11941194
processing_results,
11951195
)
11961196
assert json.dumps(event_dict)

tests/integration/test_check_rerun.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ def test_check_rerun_pr_testing_farm_handler(
291291
flexmock(Pushgateway).should_receive("push").times(2).and_return()
292292

293293
processing_results = SteveJobs().process_message(check_rerun_event_testing_farm)
294-
event_dict, job, job_config, package_config = get_parameters_from_results(
294+
event_dict, _, job_config, package_config = get_parameters_from_results(
295295
processing_results,
296296
)
297297
assert json.dumps(event_dict)
@@ -349,7 +349,7 @@ def test_check_rerun_pr_koji_build_handler(
349349
flexmock(Pushgateway).should_receive("push").times(2).and_return()
350350

351351
processing_results = SteveJobs().process_message(check_rerun_event_koji_build)
352-
event_dict, job, job_config, package_config = get_parameters_from_results(
352+
event_dict, _, job_config, package_config = get_parameters_from_results(
353353
processing_results,
354354
)
355355
assert json.dumps(event_dict)
@@ -408,7 +408,7 @@ def test_check_rerun_pr_koji_build_handler_old_job_name(
408408
flexmock(Pushgateway).should_receive("push").times(2).and_return()
409409

410410
processing_results = SteveJobs().process_message(check_rerun_event_koji_build)
411-
event_dict, job, job_config, package_config = get_parameters_from_results(
411+
event_dict, _, job_config, package_config = get_parameters_from_results(
412412
processing_results,
413413
)
414414
assert json.dumps(event_dict)
@@ -494,7 +494,7 @@ def test_check_rerun_push_testing_farm_handler(
494494
flexmock(Pushgateway).should_receive("push").times(2).and_return()
495495

496496
processing_results = SteveJobs().process_message(check_rerun_event_testing_farm)
497-
event_dict, job, job_config, package_config = get_parameters_from_results(
497+
event_dict, _, job_config, package_config = get_parameters_from_results(
498498
processing_results,
499499
)
500500
assert event_dict["tests_targets_override"] == [("fedora-rawhide-x86_64", None)]
@@ -554,7 +554,7 @@ def test_check_rerun_push_koji_build_handler(
554554
flexmock(Pushgateway).should_receive("push").times(2).and_return()
555555

556556
processing_results = SteveJobs().process_message(check_rerun_event_koji_build_push)
557-
event_dict, job, job_config, package_config = get_parameters_from_results(
557+
event_dict, _, job_config, package_config = get_parameters_from_results(
558558
processing_results,
559559
)
560560
assert event_dict["build_targets_override"] == [("f34", None)]
@@ -613,7 +613,7 @@ def test_check_rerun_release_koji_build_handler(
613613
flexmock(Pushgateway).should_receive("push").times(2).and_return()
614614

615615
processing_results = SteveJobs().process_message(check_rerun_event_koji_build)
616-
event_dict, job, job_config, package_config = get_parameters_from_results(
616+
event_dict, _, job_config, package_config = get_parameters_from_results(
617617
processing_results,
618618
)
619619
assert event_dict["build_targets_override"] == [("f34", None)]
@@ -676,7 +676,7 @@ def test_check_rerun_release_propose_downstream_handler(
676676
processing_results = SteveJobs().process_message(
677677
check_rerun_event_propose_downstream,
678678
)
679-
event_dict, job, job_config, package_config = get_parameters_from_results(
679+
event_dict, _, _, _ = get_parameters_from_results(
680680
processing_results,
681681
)
682682
assert event_dict["branches_override"] == ["f34"]

tests/integration/test_commit_comment.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ def test_commit_comment_build_and_test_handler(
142142
test_job = [item for item in processing_results if item["details"]["job"] == "tests"]
143143
assert test_job
144144

145-
event_dict, job, job_config, package_config = get_parameters_from_results(test_job)
145+
event_dict, _, job_config, package_config = get_parameters_from_results(test_job)
146146
assert json.dumps(event_dict)
147147
results = run_testing_farm_handler(
148148
package_config=package_config,

tests/integration/test_dg_commit.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def test_sync_from_downstream():
126126
)
127127

128128
processing_results = SteveJobs().process_message(distgit_commit_event())
129-
event_dict, job, job_config, package_config = get_parameters_from_results(
129+
event_dict, _, job_config, package_config = get_parameters_from_results(
130130
processing_results,
131131
)
132132
assert json.dumps(event_dict)
@@ -345,7 +345,7 @@ def test_downstream_koji_build(sidetag_group):
345345
koji_target=sidetag if sidetag_group else None,
346346
).and_return("")
347347
processing_results = SteveJobs().process_message(distgit_commit_event())
348-
event_dict, job, job_config, package_config = get_parameters_from_results(
348+
event_dict, _, job_config, package_config = get_parameters_from_results(
349349
processing_results,
350350
)
351351
assert json.dumps(event_dict)
@@ -450,7 +450,7 @@ def test_downstream_koji_build_failure_no_issue():
450450
pagure_project_mock.should_receive("create_issue").times(0)
451451

452452
processing_results = SteveJobs().process_message(distgit_commit_event())
453-
event_dict, job, job_config, package_config = get_parameters_from_results(
453+
event_dict, _, job_config, package_config = get_parameters_from_results(
454454
processing_results,
455455
)
456456
assert json.dumps(event_dict)
@@ -558,7 +558,7 @@ def test_downstream_koji_build_failure_issue_created():
558558
).once()
559559

560560
processing_results = SteveJobs().process_message(distgit_commit_event())
561-
event_dict, job, job_config, package_config = get_parameters_from_results(
561+
event_dict, _, job_config, package_config = get_parameters_from_results(
562562
processing_results,
563563
)
564564
assert json.dumps(event_dict)
@@ -681,7 +681,7 @@ def test_downstream_koji_build_failure_issue_comment():
681681
issue_project_mock.should_receive("create_issue").times(0)
682682

683683
processing_results = SteveJobs().process_message(distgit_commit_event())
684-
event_dict, job, job_config, package_config = get_parameters_from_results(
684+
event_dict, _, job_config, package_config = get_parameters_from_results(
685685
processing_results,
686686
)
687687
assert json.dumps(event_dict)
@@ -866,7 +866,7 @@ def test_downstream_koji_build_where_multiple_branches_defined(jobs_config):
866866

867867
processing_results = SteveJobs().process_message(distgit_commit_event())
868868
assert len(processing_results) == 1
869-
event_dict, job, job_config, package_config = get_parameters_from_results(
869+
event_dict, _, job_config, package_config = get_parameters_from_results(
870870
processing_results,
871871
)
872872
assert json.dumps(event_dict)

tests/integration/test_dg_pr.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ def test_downstream_koji_scratch_build(distgit_pr_event, target_branch, uid, che
152152
).once()
153153

154154
processing_results = SteveJobs().process_message(distgit_pr_event)
155-
event_dict, job, job_config, package_config = get_parameters_from_results(
155+
event_dict, _, job_config, package_config = get_parameters_from_results(
156156
processing_results,
157157
)
158158
assert json.dumps(event_dict)

tests/integration/test_github_fas_verification.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def test_verification_successful():
5656
flexmock(GithubProject).should_receive("get_issue").and_return(issue)
5757

5858
processing_results = SteveJobs().process_message(issue_comment_event())
59-
event_dict, job, job_config, package_config = get_parameters_from_results(
59+
event_dict, _, job_config, package_config = get_parameters_from_results(
6060
processing_results,
6161
)
6262
assert json.dumps(event_dict)
@@ -118,7 +118,7 @@ def test_verification_not_successful():
118118
flexmock(GithubProject).should_receive("get_issue").and_return(issue)
119119

120120
processing_results = SteveJobs().process_message(issue_comment_event())
121-
event_dict, job, job_config, package_config = get_parameters_from_results(
121+
event_dict, _, job_config, package_config = get_parameters_from_results(
122122
processing_results,
123123
)
124124
assert json.dumps(event_dict)
@@ -188,7 +188,7 @@ def test_verification_incorrect_format(comment):
188188
flexmock(GithubProject).should_receive("get_issue").and_return(issue)
189189

190190
processing_results = SteveJobs().process_message(event_issue_comment)
191-
event_dict, job, job_config, package_config = get_parameters_from_results(
191+
event_dict, _, job_config, package_config = get_parameters_from_results(
192192
processing_results,
193193
)
194194
assert json.dumps(event_dict)
@@ -242,7 +242,7 @@ def test_verification_already_approved():
242242
flexmock(GithubProject).should_receive("get_issue").and_return(issue)
243243

244244
processing_results = SteveJobs().process_message(issue_comment_event())
245-
event_dict, job, job_config, package_config = get_parameters_from_results(
245+
event_dict, _, job_config, package_config = get_parameters_from_results(
246246
processing_results,
247247
)
248248
assert json.dumps(event_dict)
@@ -289,7 +289,7 @@ def test_verification_wrong_repository():
289289
flexmock(GithubProject).should_receive("get_issue").and_return(issue)
290290

291291
processing_results = SteveJobs().process_message(issue_comment_event())
292-
event_dict, job, job_config, package_config = get_parameters_from_results(
292+
event_dict, _, _, _ = get_parameters_from_results(
293293
processing_results,
294294
)
295295
assert json.dumps(event_dict)
@@ -317,7 +317,7 @@ def test_verification_wrong_issue():
317317
flexmock(GithubProject).should_receive("get_issue").and_return(issue)
318318

319319
processing_results = SteveJobs().process_message(issue_comment_event())
320-
event_dict, job, job_config, package_config = get_parameters_from_results(
320+
event_dict, _, _, _ = get_parameters_from_results(
321321
processing_results,
322322
)
323323
assert json.dumps(event_dict)
@@ -349,7 +349,7 @@ def test_verification_not_original_triggerer():
349349
flexmock(GithubProject).should_receive("get_issue").and_return(issue)
350350

351351
processing_results = SteveJobs().process_message(issue_comment_event())
352-
event_dict, job, job_config, package_config = get_parameters_from_results(
352+
event_dict, _, job_config, package_config = get_parameters_from_results(
353353
processing_results,
354354
)
355355
assert json.dumps(event_dict)

0 commit comments

Comments
 (0)