diff --git a/augur/tasks/git/util/facade_worker/facade_worker/facade07rebuildcache.py b/augur/tasks/git/util/facade_worker/facade_worker/facade07rebuildcache.py index 252f82b0cd..385de4dc36 100644 --- a/augur/tasks/git/util/facade_worker/facade_worker/facade07rebuildcache.py +++ b/augur/tasks/git/util/facade_worker/facade_worker/facade07rebuildcache.py @@ -43,7 +43,7 @@ # else: # import MySQLdb -def nuke_affiliations(session, repo_id_list): +def nuke_affiliations(session): # Delete all stored affiliations in the database. Normally when you # add/remove/change affiliation data via the web UI, any potentially affected @@ -56,8 +56,7 @@ def nuke_affiliations(session, repo_id_list): session.log_activity('Info','Nuking affiliations') nuke = s.sql.text("""UPDATE commits SET cmt_author_affiliation = NULL, - cmt_committer_affiliation = NULL - WHERE repo_id IN :values""").bindparams(values=tuple(repo_id_list)) + cmt_committer_affiliation = NULL""") session.execute_sql(nuke) diff --git a/augur/tasks/start_tasks.py b/augur/tasks/start_tasks.py index 9e41015a82..dfb10f5a6b 100644 --- a/augur/tasks/start_tasks.py +++ b/augur/tasks/start_tasks.py @@ -78,7 +78,7 @@ def repo_collect_phase(): logger.info(f"Scheduling groups of {len(first_pass)}") #Pool the tasks for collecting repo info. repo_info_tasks = create_grouped_task_load(dataList=first_pass, task=collect_repo_info).tasks - + #pool the repo collection jobs that should be ran first and have deps. primary_repo_jobs = group( *create_grouped_task_load(dataList=first_pass, task=collect_issues).tasks, @@ -91,7 +91,6 @@ def repo_collect_phase(): *create_grouped_task_load(dataList=first_pass, task=process_pull_request_files).tasks, *create_grouped_task_load(dataList=first_pass, task=process_pull_request_commits).tasks ) - repo_task_group = group( *repo_info_tasks,