Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ repos:
- id: rst-inline-touching-normal
- id: text-unicode-replacement-char
- repo: https://github.com/asottile/pyupgrade
rev: v2.16.0
rev: v2.18.2
hooks:
- id: pyupgrade
args: [--py36-plus]
Expand Down
12 changes: 4 additions & 8 deletions src/_pytask/collect_command.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,16 +110,12 @@ def _organize_tasks(tasks, common_ancestor):
task_dict = {
reduced_task_name: {
"depends_on": sorted(
[
relative_to(node.path, common_ancestor)
for node in task.depends_on.values()
]
relative_to(node.path, common_ancestor)
for node in task.depends_on.values()
),
"produces": sorted(
[
relative_to(node.path, common_ancestor)
for node in task.produces.values()
]
relative_to(node.path, common_ancestor)
for node in task.produces.values()
),
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/_pytask/skipping.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def pytask_execute_task_setup(task):
markers = get_specific_markers_from_task(task, "skip_ancestor_failed")
if markers:
message = "\n".join(
[skip_ancestor_failed(*marker.args, **marker.kwargs) for marker in markers]
skip_ancestor_failed(*marker.args, **marker.kwargs) for marker in markers
)
raise SkippedAncestorFailed(message)

Expand All @@ -56,7 +56,7 @@ def pytask_execute_task_setup(task):
markers = get_specific_markers_from_task(task, "skipif")
if markers:
marker_args = [skipif(*marker.args, **marker.kwargs) for marker in markers]
message = "\n".join([arg[1] for arg in marker_args if arg[0]])
message = "\n".join(arg[1] for arg in marker_args if arg[0])
should_skip = any(arg[0] for arg in marker_args)
if should_skip:
raise Skipped(message)
Expand Down