From 99e94c91622d803d6053d5b3495a0e859ae8d6a6 Mon Sep 17 00:00:00 2001 From: Andrew Brain Date: Sat, 9 Dec 2023 14:41:08 -0600 Subject: [PATCH] Comment out assignee inserts and update tasks that are running Signed-off-by: Andrew Brain --- augur/tasks/gitlab/issues_task.py | 4 ++-- augur/tasks/gitlab/merge_request_task.py | 4 ++-- augur/tasks/start_tasks.py | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/augur/tasks/gitlab/issues_task.py b/augur/tasks/gitlab/issues_task.py index eeb0f4ac34..5ffc633d0e 100644 --- a/augur/tasks/gitlab/issues_task.py +++ b/augur/tasks/gitlab/issues_task.py @@ -144,8 +144,8 @@ def process_issues(issues, task_name, repo_id, logger, augur_db) -> None: # inserting issue assignees # we are using issue_assignee_src_id and issue_id to determine if the label is already in the database. - issue_assignee_natural_keys = ['issue_assignee_src_id', 'issue_id'] - augur_db.insert_data(issue_assignee_dicts, IssueAssignee, issue_assignee_natural_keys) + # issue_assignee_natural_keys = ['issue_assignee_src_id', 'issue_id'] + # augur_db.insert_data(issue_assignee_dicts, IssueAssignee, issue_assignee_natural_keys) return issue_ids diff --git a/augur/tasks/gitlab/merge_request_task.py b/augur/tasks/gitlab/merge_request_task.py index cab648fdb3..adce8f60c7 100644 --- a/augur/tasks/gitlab/merge_request_task.py +++ b/augur/tasks/gitlab/merge_request_task.py @@ -116,8 +116,8 @@ def process_merge_requests(data, task_name, repo_id, logger, augur_db): logger.info(f"{task_name}: Inserting other pr data of lengths: Labels: {len(mr_label_dicts)} - Assignees: {len(mr_assignee_dicts)}") # TODO: Setup unique key on asignees with a value of ('cntrb_id', 'pull_request_id') and add 'cntrb_id' to assingee data - mr_assignee_natural_keys = ['pr_assignee_src_id', 'pull_request_id'] - augur_db.insert_data(mr_assignee_dicts, PullRequestAssignee, mr_assignee_natural_keys) + # mr_assignee_natural_keys = ['pr_assignee_src_id', 'pull_request_id'] + # augur_db.insert_data(mr_assignee_dicts, PullRequestAssignee, mr_assignee_natural_keys) pr_label_natural_keys = ['pr_src_id', 'pull_request_id'] pr_label_string_fields = ["pr_src_description"] diff --git a/augur/tasks/start_tasks.py b/augur/tasks/start_tasks.py index 6c01e42b98..c11ea76d53 100644 --- a/augur/tasks/start_tasks.py +++ b/augur/tasks/start_tasks.py @@ -102,17 +102,17 @@ def primary_repo_collect_phase_gitlab(repo_git): jobs = group( chain(collect_gitlab_merge_requests.si(repo_git), group( - #collect_merge_request_comments.s(repo_git), + collect_merge_request_comments.s(repo_git), #collect_merge_request_reviewers.s(repo_git), - #collect_merge_request_metadata.s(repo_git), + collect_merge_request_metadata.s(repo_git), collect_merge_request_commits.s(repo_git), - #collect_merge_request_files.s(repo_git), - # collect_merge_request_events.si(repo_git), + collect_merge_request_files.s(repo_git), + collect_gitlab_merge_request_events.si(repo_git), )), - # chain(collect_gitlab_issues.si(repo_git), group( - # collect_gitlab_issue_comments.s(repo_git), - # collect_gitlab_issue_events.si(repo_git), - # )), + chain(collect_gitlab_issues.si(repo_git), group( + #collect_gitlab_issue_comments.s(repo_git), + collect_gitlab_issue_events.si(repo_git), + # )), ) return jobs