Skip to content

Commit

Permalink
Merge branch 'master' into release_3.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
RRap0so authored Aug 18, 2022
2 parents 43eb766 + 9687f2d commit 9a2e7b9
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions luigi/execution_summary.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,14 @@ def _partition_tasks(worker):
Still_pending_not_ext is only used to get upstream_failure, upstream_missing_dependency and run_by_other_worker
"""
task_history = worker._add_task_history
pending_tasks = {task for(task, status, ext) in task_history if status == 'PENDING'}
pending_tasks = {task for (task, status, ext) in task_history if status == 'PENDING'}
set_tasks = {}
set_tasks["completed"] = {task for (task, status, ext) in task_history if status == 'DONE' and task in pending_tasks}
set_tasks["already_done"] = {task for (task, status, ext) in task_history
if status == 'DONE' and task not in pending_tasks and task not in set_tasks["completed"]}
set_tasks["ever_failed"] = {task for (task, status, ext) in task_history if status == 'FAILED'}
set_tasks["failed"] = set_tasks["ever_failed"] - set_tasks["completed"]
set_tasks["scheduling_error"] = {task for(task, status, ext) in task_history if status == 'UNKNOWN'}
set_tasks["scheduling_error"] = {task for (task, status, ext) in task_history if status == 'UNKNOWN'}
set_tasks["still_pending_ext"] = {task for (task, status, ext) in task_history
if status == 'PENDING' and task not in set_tasks["ever_failed"] and task not in set_tasks["completed"] and not ext}
set_tasks["still_pending_not_ext"] = {task for (task, status, ext) in task_history
Expand Down
2 changes: 1 addition & 1 deletion luigi/interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def _schedule_and_run(tasks, worker_scheduler_factory=None, override_defaults=No

kill_signal = signal.SIGUSR1 if env_params.take_lock else None
if (not env_params.no_lock and
not(lock.acquire_for(env_params.lock_pid_dir, env_params.lock_size, kill_signal))):
not (lock.acquire_for(env_params.lock_pid_dir, env_params.lock_size, kill_signal))):
raise PidLockAlreadyTakenExit()

if env_params.local_scheduler:
Expand Down
2 changes: 1 addition & 1 deletion luigi/tools/deps_tree.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def print_tree(task, indent='', last=True):
name = task.__class__.__name__
params = task.to_str_params(only_significant=True)
result = '\n' + indent
if(last):
if (last):
result += '└─--'
indent += ' '
else:
Expand Down
2 changes: 1 addition & 1 deletion test/task_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def test_task_missing_necessary_param(self):

def test_external_tasks_loadable(self):
task = load_task("luigi", "ExternalTask", {})
assert(isinstance(task, luigi.ExternalTask))
self.assertTrue(isinstance(task, luigi.ExternalTask))

def test_getpaths(self):
class RequiredTask(luigi.Task):
Expand Down

0 comments on commit 9a2e7b9

Please sign in to comment.