From 149562b984377ffca8d6e39de4efb43411e1d605 Mon Sep 17 00:00:00 2001 From: Aniket-Rai1 <53720401+Aniket-Rai1@users.noreply.github.com> Date: Thu, 28 Sep 2023 20:11:46 -0400 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Added=20port=20to=20project.pros:?= =?UTF-8?q?=20(#292)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Uninstall charset_normalizer * added port option * Update pros/cli/conductor.py Co-authored-by: BennyBot <48661356+BennyBot@users.noreply.github.com> * Update .github/workflows/main.yml Co-authored-by: BennyBot <48661356+BennyBot@users.noreply.github.com> * Update pros/cli/upload.py * 🐛 Fix fat binary error in CI (#293) * Update main.yml * Try new version of python * Maybe this will work? * We try again * Make the uninstall work * Work --------- Co-authored-by: Kunwar Sahni * Uninstall charset_normalizer * added port option * Update pros/cli/conductor.py Co-authored-by: BennyBot <48661356+BennyBot@users.noreply.github.com> * Update .github/workflows/main.yml Co-authored-by: BennyBot <48661356+BennyBot@users.noreply.github.com> * Update pros/cli/upload.py --------- Co-authored-by: ayushuk Co-authored-by: Ayush Shukla <71904196+ayushuk@users.noreply.github.com> Co-authored-by: BennyBot <48661356+BennyBot@users.noreply.github.com> Co-authored-by: Kunwar Sahni Co-authored-by: Benjamin Davis --- pros/cli/upload.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pros/cli/upload.py b/pros/cli/upload.py index 63f132a4..545609a4 100644 --- a/pros/cli/upload.py +++ b/pros/cli/upload.py @@ -70,6 +70,8 @@ def upload(path: Optional[str], project: Optional[c.Project], port: str, **kwarg # apply upload_options as a template options = dict(**project.upload_options) + if 'port' in options and port is None: + port = options.get('port', None) if 'slot' in options and kwargs.get('slot', None) is None: kwargs.pop('slot') elif kwargs.get('slot', None) is None: