From 17919d7503cd5bee8e63c259427682cc419d97dd Mon Sep 17 00:00:00 2001 From: "Paul Gauthier (aider)" Date: Mon, 10 Feb 2025 11:37:30 -0800 Subject: [PATCH 1/3] refactor: Add priority label check to prevent bot actions on priority issues --- scripts/issues.py | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/scripts/issues.py b/scripts/issues.py index b474d6f42..0603317de 100755 --- a/scripts/issues.py +++ b/scripts/issues.py @@ -126,6 +126,11 @@ def find_oldest_issue(subject, all_issues): def comment_and_close_duplicate(issue, oldest_issue): + # Skip if issue is labeled as priority + if "priority" in [label["name"] for label in issue["labels"]]: + print(f" - Skipping priority issue #{issue['number']}") + return + comment_url = ( f"{GITHUB_API_URL}/repos/{REPO_OWNER}/{REPO_NAME}/issues/{issue['number']}/comments" ) @@ -168,7 +173,10 @@ def find_unlabeled_with_paul_comments(issues): def handle_unlabeled_issues(all_issues, auto_yes): print("\nFinding unlabeled issues with paul-gauthier comments...") - unlabeled_issues = find_unlabeled_with_paul_comments(all_issues) + unlabeled_issues = [ + issue for issue in find_unlabeled_with_paul_comments(all_issues) + if "priority" not in [label["name"] for label in issue["labels"]] + ] if not unlabeled_issues: print("No unlabeled issues with paul-gauthier comments found.") @@ -197,10 +205,12 @@ def handle_stale_issues(all_issues, auto_yes): for issue in all_issues: # Skip if not open, not a question, already stale, or has been reopened + labels = [label["name"] for label in issue["labels"]] if ( issue["state"] != "open" - or "question" not in [label["name"] for label in issue["labels"]] - or "stale" in [label["name"] for label in issue["labels"]] + or "question" not in labels + or "stale" in labels + or "priority" in labels or has_been_reopened(issue["number"]) ): continue @@ -239,8 +249,9 @@ def handle_stale_closing(all_issues, auto_yes): print("\nChecking for issues to close or unstale...") for issue in all_issues: - # Skip if not open or not stale - if issue["state"] != "open" or "stale" not in [label["name"] for label in issue["labels"]]: + # Skip if not open, not stale, or is priority + labels = [label["name"] for label in issue["labels"]] + if issue["state"] != "open" or "stale" not in labels or "priority" in labels: continue # Get the timeline to find when the stale label was last added @@ -324,9 +335,9 @@ def handle_fixed_issues(all_issues, auto_yes): print("\nChecking for fixed enhancement and bug issues to close...") for issue in all_issues: - # Skip if not open or doesn't have fixed label + # Skip if not open, doesn't have fixed label, or is priority labels = [label["name"] for label in issue["labels"]] - if issue["state"] != "open" or "fixed" not in labels: + if issue["state"] != "open" or "fixed" not in labels or "priority" in labels: continue # Check if it's an enhancement or bug From 30332c2ba5db6d08b190be78f9741ba2a0fee730 Mon Sep 17 00:00:00 2001 From: "Paul Gauthier (aider)" Date: Mon, 10 Feb 2025 11:37:35 -0800 Subject: [PATCH 2/3] style: Apply linter formatting to issues.py script --- scripts/issues.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/issues.py b/scripts/issues.py index 0603317de..17e381706 100755 --- a/scripts/issues.py +++ b/scripts/issues.py @@ -174,7 +174,8 @@ def find_unlabeled_with_paul_comments(issues): def handle_unlabeled_issues(all_issues, auto_yes): print("\nFinding unlabeled issues with paul-gauthier comments...") unlabeled_issues = [ - issue for issue in find_unlabeled_with_paul_comments(all_issues) + issue + for issue in find_unlabeled_with_paul_comments(all_issues) if "priority" not in [label["name"] for label in issue["labels"]] ] From bca6507f11ebec4a968792407acbd75a4e235cb1 Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Mon, 10 Feb 2025 11:48:19 -0800 Subject: [PATCH 3/3] bump deps --- requirements.txt | 4 ++-- requirements/requirements-browser.txt | 2 +- requirements/requirements-dev.txt | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index b1933f406..7f6caaea4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -99,7 +99,7 @@ jsonschema==4.23.0 # litellm jsonschema-specifications==2024.10.1 # via jsonschema -litellm==1.60.6 +litellm==1.60.8 # via -r requirements/requirements.in markdown-it-py==3.0.0 # via rich @@ -254,5 +254,5 @@ zipp==3.21.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: -pip==25.0 +pip==25.0.1 # via -r requirements/requirements.in diff --git a/requirements/requirements-browser.txt b/requirements/requirements-browser.txt index 00e165273..f50bb66d4 100644 --- a/requirements/requirements-browser.txt +++ b/requirements/requirements-browser.txt @@ -92,7 +92,7 @@ mdurl==0.1.2 # -c requirements.txt # -c requirements/requirements-dev.txt # markdown-it-py -narwhals==1.25.2 +narwhals==1.26.0 # via altair numpy==1.26.4 # via diff --git a/requirements/requirements-dev.txt b/requirements/requirements-dev.txt index 5234c9175..402dda963 100644 --- a/requirements/requirements-dev.txt +++ b/requirements/requirements-dev.txt @@ -53,7 +53,7 @@ filelock==3.17.0 # virtualenv fonttools==4.56.0 # via matplotlib -identify==2.6.6 +identify==2.6.7 # via pre-commit idna==3.10 # via @@ -218,13 +218,13 @@ urllib3==2.3.0 # -c /Users/gauthier/Projects/aider/requirements.txt # -c requirements.txt # requests -virtualenv==20.29.1 +virtualenv==20.29.2 # via pre-commit wheel==0.45.1 # via pip-tools # The following packages are considered to be unsafe in a requirements file: -pip==25.0 +pip==25.0.1 # via # -c /Users/gauthier/Projects/aider/requirements.txt # -c requirements.txt