From 9606f8f45ac993a0533dc99c7046b72f834fbb48 Mon Sep 17 00:00:00 2001 From: Mayank Patibandla <34776435+mayankpatibandla@users.noreply.github.com> Date: Wed, 6 Dec 2023 14:22:49 -0500 Subject: [PATCH 1/5] Add rich click --- pros/cli/click_classes.py | 3 ++- pros/cli/main.py | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pros/cli/click_classes.py b/pros/cli/click_classes.py index cb5a82c0..b071c938 100644 --- a/pros/cli/click_classes.py +++ b/pros/cli/click_classes.py @@ -1,13 +1,14 @@ from collections import defaultdict from typing import * +from rich_click import RichCommand import click.decorators from click import ClickException from pros.conductor.project import Project as p from pros.common.utils import get_version -class PROSFormatted(click.BaseCommand): +class PROSFormatted(RichCommand): """ Common format functions used in the PROS derived classes. Derived classes mix and match which functions are needed """ diff --git a/pros/cli/main.py b/pros/cli/main.py index 7a7e252a..2906aa74 100644 --- a/pros/cli/main.py +++ b/pros/cli/main.py @@ -7,6 +7,7 @@ import pros.common.sentry import click +import ctypes import sys import pros.common.ui as ui @@ -27,6 +28,10 @@ import pros.cli.interactive import pros.cli.user_script +if sys.platform == 'win32': + kernel32 = ctypes.windll.kernel32 + kernel32.SetConsoleMode(kernel32.GetStdHandle(-11), 7) + root_sources = [ 'build', 'conductor', From d4c09ac419822d989ac4bdc134d5571a950227b1 Mon Sep 17 00:00:00 2001 From: Mayank Patibandla <34776435+mayankpatibandla@users.noreply.github.com> Date: Wed, 6 Dec 2023 17:06:39 -0500 Subject: [PATCH 2/5] Add rich-click to requirements --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 0cbde8f3..3ce902d4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ click>=6,<7 +rich-click pyserial cachetools requests From 1e8ad684f40dee406895eaf12c8e209ef2ce7a67 Mon Sep 17 00:00:00 2001 From: Mayank Patibandla <34776435+mayankpatibandla@users.noreply.github.com> Date: Thu, 7 Dec 2023 20:16:16 -0500 Subject: [PATCH 3/5] Update click version --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3ce902d4..c84eddb0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -click>=6,<7 +click>=8 rich-click pyserial cachetools @@ -14,4 +14,4 @@ scan-build==2.0.13 sentry-sdk observable pypng==0.0.20 -pyinstaller \ No newline at end of file +pyinstaller From 173d269d73e0cb27094f9bb8b6481412f270771b Mon Sep 17 00:00:00 2001 From: ayushuk Date: Sun, 14 Jan 2024 11:35:28 -0500 Subject: [PATCH 4/5] Remove pyinstaller requirement --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c84eddb0..350eb005 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,4 +14,3 @@ scan-build==2.0.13 sentry-sdk observable pypng==0.0.20 -pyinstaller From fc78a4cabb02fee727ba2f08def2aed00cd0514c Mon Sep 17 00:00:00 2001 From: ayushuk Date: Sun, 14 Jan 2024 11:38:21 -0500 Subject: [PATCH 5/5] Add back pyinstaller --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 350eb005..c84eddb0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,3 +14,4 @@ scan-build==2.0.13 sentry-sdk observable pypng==0.0.20 +pyinstaller