diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 95a263c2..574104a2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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] diff --git a/src/_pytask/collect_command.py b/src/_pytask/collect_command.py index b3e56078..511d9eaa 100644 --- a/src/_pytask/collect_command.py +++ b/src/_pytask/collect_command.py @@ -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() ), } } diff --git a/src/_pytask/skipping.py b/src/_pytask/skipping.py index b902ef8c..98655ca7 100644 --- a/src/_pytask/skipping.py +++ b/src/_pytask/skipping.py @@ -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) @@ -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)