Skip to content

Commit 2c46677

Browse files
[pre-commit.ci] pre-commit autoupdate (#2458)
[pre-commit.ci] pre-commit autoupdate updates: github.com/astral-sh/ruff-pre-commit: v0.7.0 → v0.8.4 github.com/pre-commit/mirrors-mypy: v1.11.2 → v1.14.0 github.com/pre-commit/pre-commit-hooks: v4.6.0 → v5.0.0 github.com/gitleaks/gitleaks: v8.18.4 → v8.22.1 github.com/python-jsonschema/check-jsonschema: 0.29.2 → 0.30.0 Reviewed-by: Laura Barcziová
2 parents 735045c + 09d718d commit 2c46677

File tree

4 files changed

+17
-18
lines changed

4 files changed

+17
-18
lines changed

.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.7.0
7+
rev: v0.8.4
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.11.2
13+
rev: v1.14.0
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: v4.6.0
44+
rev: v5.0.0
4545
hooks:
4646
- id: check-added-large-files
4747
- id: check-ast
@@ -69,7 +69,7 @@ repos:
6969
- id: check-rebase
7070
args:
7171
- https://github.com/packit/packit-service.git
72-
stages: [manual, push]
72+
stages: [manual, pre-push]
7373
- repo: https://github.com/packit/requre
7474
rev: 0.8.4
7575
hooks:
@@ -94,16 +94,16 @@ repos:
9494
language: python
9595
types: [yaml]
9696
files: /tests_openshift.*\.yaml$
97-
stages: [manual, push]
97+
stages: [manual, pre-push]
9898
- repo: https://github.com/gitleaks/gitleaks
99-
rev: v8.18.4
99+
rev: v8.22.1
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.
104-
stages: [commit]
104+
stages: [pre-commit]
105105
- repo: https://github.com/python-jsonschema/check-jsonschema
106-
rev: 0.29.2
106+
rev: 0.30.0
107107
hooks:
108108
- id: check-github-workflows
109109
args: ["--verbose"]

packit_service/worker/events/comment.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,8 @@ def build_targets_override(self) -> Optional[set[tuple[str, str]]]:
100100
# see that something has failed and only for those targets the
101101
# tests will be submitted.
102102
if (
103-
not self._build_targets_override
104-
and "rebuild-failed" in self.comment
105-
or "retest-failed" in self.comment
106-
):
103+
not self._build_targets_override and "rebuild-failed" in self.comment
104+
) or "retest-failed" in self.comment:
107105
self._build_targets_override = (
108106
super().get_all_build_targets_by_status(
109107
statuses_to_filter_with=[BuildStatus.failure],

packit_service/worker/helpers/sync_release/sync_release.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,12 @@ def job(self) -> Optional[JobConfig]:
108108
self._db_project_object.job_config_trigger_type == job.trigger
109109
# pull-from-upstream can be retriggered by a dist-git PR comment,
110110
# in which case the trigger types don't match
111-
or job.type == JobType.pull_from_upstream
112-
and self._db_project_object.job_config_trigger_type
113-
== JobConfigTriggerType.pull_request
114-
and job.trigger == JobConfigTriggerType.release
111+
or (
112+
job.type == JobType.pull_from_upstream
113+
and self._db_project_object.job_config_trigger_type
114+
== JobConfigTriggerType.pull_request
115+
and job.trigger == JobConfigTriggerType.release
116+
)
115117
)
116118
):
117119
self._job = job

tests/integration/test_bodhi_update.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,8 +1148,7 @@ def _create_update(dist_git_branch, update_type, koji_builds, sidetag, alias):
11481148
0
11491149
if missing_dependency
11501150
or non_unique_builds
1151-
or existing_update
1152-
and " " in existing_update.koji_nvrs
1151+
or (existing_update and " " in existing_update.koji_nvrs)
11531152
else 1
11541153
),
11551154
)

0 commit comments

Comments
 (0)