Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🔖 Release 3.5.0 #313

Closed
wants to merge 16 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
✨ Added port to project.pros: (#292)
* 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 <kunwar.sahni01@gmail.com>

* 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 <ayushshukla30339@gmail.com>
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 <kunwar.sahni01@gmail.com>
Co-authored-by: Benjamin Davis <davi1561@purdue.edu>
6 people authored Sep 29, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 149562b984377ffca8d6e39de4efb43411e1d605
2 changes: 2 additions & 0 deletions pros/cli/upload.py
Original file line number Diff line number Diff line change
@@ -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: