From fa2f633df6478cba4c8634de5e52786f38c0dfb6 Mon Sep 17 00:00:00 2001 From: dorschw <81086590+dorschw@users.noreply.github.com> Date: Thu, 29 Jun 2023 12:09:18 +0300 Subject: [PATCH] Update contribution reviewers (#27791) * update reviewers, update code standards * fix type hint * 3.x to 3.10 --- .github/workflows/handle-new-external-pr.yml | 2 +- Utils/github_workflow_scripts/handle_external_pr.py | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/handle-new-external-pr.yml b/.github/workflows/handle-new-external-pr.yml index 3d390b380e7d..eeff93219a1c 100644 --- a/.github/workflows/handle-new-external-pr.yml +++ b/.github/workflows/handle-new-external-pr.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v3 with: - python-version: '3.9' + python-version: '3.10' - name: Setup Poetry uses: Gr1N/setup-poetry@v8 - name: Print Context diff --git a/Utils/github_workflow_scripts/handle_external_pr.py b/Utils/github_workflow_scripts/handle_external_pr.py index c9e551b90478..607719e869b0 100755 --- a/Utils/github_workflow_scripts/handle_external_pr.py +++ b/Utils/github_workflow_scripts/handle_external_pr.py @@ -2,7 +2,6 @@ import json import os -from typing import List, Set from pathlib import Path import urllib3 @@ -17,7 +16,7 @@ urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) print = timestamped_print -REVIEWERS = ['thefrieddan1', 'michal-dagan', 'RotemAmit'] +REVIEWERS = ['mmhw', 'maimorag', 'anas-yousef'] MARKETPLACE_CONTRIBUTION_PR_AUTHOR = 'xsoar-bot' WELCOME_MSG = 'Thank you for your contribution. Your generosity and caring are unrivaled! Rest assured - our content ' \ 'wizard @{selected_reviewer} will very shortly look over your proposed changes.' @@ -34,7 +33,7 @@ CONTRIBUTION_LABEL = 'Contribution' -def determine_reviewer(potential_reviewers: List[str], repo: Repository) -> str: +def determine_reviewer(potential_reviewers: list[str], repo: Repository) -> str: """Checks the number of open 'Contribution' PRs that have either been assigned to a user or a review was requested from the user for each potential reviewer and returns the user with the smallest amount @@ -67,7 +66,7 @@ def determine_reviewer(potential_reviewers: List[str], repo: Repository) -> str: return selected_reviewer -def get_packs_support_levels(pack_dirs: Set[str]) -> Set[str]: +def get_packs_support_levels(pack_dirs: set[str]) -> set[str]: """ Get the pack support levels from the pack metadata. @@ -86,7 +85,7 @@ def get_packs_support_levels(pack_dirs: Set[str]) -> Set[str]: return packs_support_levels -def get_packs_support_level_label(file_paths: List[str], external_pr_branch: str) -> str: +def get_packs_support_level_label(file_paths: list[str], external_pr_branch: str) -> str: """ Get The contributions' support level label. @@ -143,7 +142,7 @@ def get_packs_support_level_label(file_paths: List[str], external_pr_branch: str return get_highest_support_label(packs_support_levels) if packs_support_levels else '' -def get_highest_support_label(packs_support_levels: Set[str]): +def get_highest_support_label(packs_support_levels: set[str]) -> str: """ Get the highest support level. @@ -206,7 +205,7 @@ def main(): branch_prefix = 'contrib/' new_branch_name = f'{branch_prefix}{pr.head.label.replace(":", "_")}' existant_branches = content_repo.get_git_matching_refs(f'heads/{branch_prefix}') - potential_conflicting_branch_names = [branch.ref.lstrip('refs/heads/') for branch in existant_branches] + potential_conflicting_branch_names = [branch.ref.removeprefix('refs/heads/') for branch in existant_branches] # make sure new branch name does not conflict with existing branch name while new_branch_name in potential_conflicting_branch_names: # append or increment digit