Skip to content

Commit 5f0e20e

Browse files
authored
Merge pull request #10 from packit/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2 parents d8fb994 + 95b467a commit 5f0e20e

File tree

4 files changed

+68
-41
lines changed

4 files changed

+68
-41
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ repos:
2424
hooks:
2525
- id: black
2626
- repo: https://github.com/astral-sh/ruff-pre-commit
27-
rev: v0.2.1
27+
rev: v0.2.2
2828
hooks:
2929
- id: ruff
3030
args: [--fix, --exit-non-zero-on-fix]

pyproject.toml

Lines changed: 37 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -78,39 +78,42 @@ skip-string-normalization = true
7878
[tool.ruff]
7979
target-version = "py39"
8080
line-length = 100
81+
82+
[tool.ruff.lint]
8183
select = [
82-
"A", # flake8-builtins
83-
"ARG", # flake8-unused-arguments
84-
"B", # flake8-bugbear
84+
"A", # flake8-builtins
85+
"ASYNC", # flake8-async
86+
"ARG", # flake8-unused-arguments
87+
"B", # flake8-bugbear
8588
"C",
86-
"C4", # flake8-comprehensions
87-
"COM", # flake8-commas
88-
"DTZ", # flake8-datetimez
89-
"E", # pycodestyle Error
90-
"EM", # flake8-errmsg
91-
"F", # Pyflakes
92-
"FBT", # flake8-boolean-trap
93-
"G", # flake8-logging-format
94-
"I", # isort
95-
"ICN", # flake8-import-conventions
96-
"ISC", # flake8-implicit-str-concat
97-
"N", # pep8-naming
98-
"PERF", # Perflint
99-
"PIE", # flake8-pie
100-
"PLC", # Pylint Convention
101-
"PLE", # Pylint Error
102-
"PLR", # Pylint Refactor
103-
"PLW", # Pylint Warning
104-
"Q", # flake8-quotes
105-
"RET", # flake8-return
106-
"RUF", # Ruff-specific rules
107-
"S", # flake8-bandit
108-
"SIM", # flake8-simplify
89+
"C4", # flake8-comprehensions
90+
"COM", # flake8-commas
91+
"DTZ", # flake8-datetimez
92+
"E", # pycodestyle Error
93+
"EM", # flake8-errmsg
94+
"F", # Pyflakes
95+
"FBT", # flake8-boolean-trap
96+
"G", # flake8-logging-format
97+
"I", # isort
98+
"ICN", # flake8-import-conventions
99+
"ISC", # flake8-implicit-str-concat
100+
"N", # pep8-naming
101+
"PERF", # Perflint
102+
"PIE", # flake8-pie
103+
"PLC", # Pylint Convention
104+
"PLE", # Pylint Error
105+
"PLR", # Pylint Refactor
106+
"PLW", # Pylint Warning
107+
"Q", # flake8-quotes
108+
"RET", # flake8-return
109+
"RUF", # Ruff-specific rules
110+
"S", # flake8-bandit
111+
"SIM", # flake8-simplify
109112
"T",
110-
"TID", # flake8-tidy-imports
111-
"UP", # pyupgrade
112-
"W", # pycodestyle Warning
113-
"YTT", # flake8-2020
113+
"TID", # flake8-tidy-imports
114+
"UP", # pyupgrade
115+
"W", # pycodestyle Warning
116+
"YTT", # flake8-2020
114117
]
115118
ignore = [
116119
# Allow non-abstract empty methods in abstract base classes
@@ -131,15 +134,15 @@ allowed-confusables = [
131134
"", "",
132135
]
133136

134-
[tool.ruff.isort]
137+
[tool.ruff.lint.isort]
135138
known-first-party = ["validation"]
136139

137-
[tool.ruff.flake8-tidy-imports]
140+
[tool.ruff.lint.flake8-tidy-imports]
138141
ban-relative-imports = "all"
139142

140-
[tool.ruff.per-file-ignores]
143+
[tool.ruff.lint.per-file-ignores]
141144
# Tests can use magic values, assertions, and relative imports
142145
"tests/**/*" = ["PLR2004", "S101", "TID252"]
143146

144-
[tool.ruff.pydocstyle]
147+
[tool.ruff.lint.pydocstyle]
145148
convention = "google"

src/validation/cli/__init__.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,15 @@
1818
@click.version_option(prog_name="validation")
1919
def validation():
2020
loop = asyncio.get_event_loop()
21+
tasks = set()
22+
2123
# GitHub
2224
if getenv("GITHUB_TOKEN"):
2325
logging.info("Running validation for GitHub.")
24-
loop.create_task(GithubTests().run())
26+
task = loop.create_task(GithubTests().run())
27+
28+
tasks.add(task)
29+
task.add_done_callback(tasks.discard)
2530
else:
2631
logging.info("GITHUB_TOKEN not set, skipping the validation for GitHub.")
2732

@@ -46,12 +51,15 @@ def validation():
4651
continue
4752

4853
logging.info("Running validation for GitLab instance: %s", instance_url)
49-
loop.create_task(
54+
task = loop.create_task(
5055
GitlabTests(
5156
instance_url=instance_url,
5257
namespace=namespace,
5358
token_name=token,
5459
).run(),
5560
)
5661

62+
tasks.add(task)
63+
task.add_done_callback(tasks.discard)
64+
5765
loop.run_forever()

src/validation/tests/base.py

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ class Tests:
1717

1818
async def run(self):
1919
loop = asyncio.get_event_loop()
20+
tasks = set()
21+
2022
prs_for_comment = [
2123
pr for pr in self.project.get_pr_list() if pr.title.startswith("Test VM Image builds")
2224
]
@@ -32,7 +34,7 @@ async def run(self):
3234
)
3335
logging.warning(msg)
3436
for pr in prs_for_comment:
35-
loop.create_task(
37+
task = loop.create_task(
3638
self.test_case_kls(
3739
project=self.project,
3840
pr=pr,
@@ -42,6 +44,9 @@ async def run(self):
4244
).run_test(),
4345
)
4446

47+
tasks.add(task)
48+
task.add_done_callback(tasks.discard)
49+
4550
prs_for_comment = [
4651
pr for pr in self.project.get_pr_list() if pr.title.startswith("Basic test case:")
4752
]
@@ -57,7 +62,7 @@ async def run(self):
5762
)
5863
logging.warning(msg)
5964
for pr in prs_for_comment:
60-
loop.create_task(
65+
task = loop.create_task(
6166
self.test_case_kls(
6267
project=self.project,
6368
pr=pr,
@@ -66,6 +71,9 @@ async def run(self):
6671
).run_test(),
6772
)
6873

74+
tasks.add(task)
75+
task.add_done_callback(tasks.discard)
76+
6977
pr_for_push = [
7078
pr
7179
for pr in self.project.get_pr_list()
@@ -83,7 +91,7 @@ async def run(self):
8391
)
8492
logging.warning(msg)
8593
if pr_for_push:
86-
loop.create_task(
94+
task = loop.create_task(
8795
self.test_case_kls(
8896
project=self.project,
8997
pr=pr_for_push[0],
@@ -92,9 +100,17 @@ async def run(self):
92100
).run_test(),
93101
)
94102

103+
tasks.add(task)
104+
task.add_done_callback(tasks.discard)
105+
95106
msg = (
96107
"Run testcase where the build is triggered by opening "
97108
f"a new PR {self.project.service.instance_url}"
98109
)
99110
logging.info(msg)
100-
loop.create_task(self.test_case_kls(project=self.project, deployment=DEPLOYMENT).run_test())
111+
112+
task = loop.create_task(
113+
self.test_case_kls(project=self.project, deployment=DEPLOYMENT).run_test(),
114+
)
115+
tasks.add(task)
116+
task.add_done_callback(tasks.discard)

0 commit comments

Comments
 (0)