From d49c5fa9c5a7f7d8b2689b7cd372a1f5521d37ea Mon Sep 17 00:00:00 2001 From: n-dusan Date: Tue, 10 Sep 2024 16:14:23 -0400 Subject: [PATCH] fix: use `kwargs` to add keyword args to `try_running_module` This fixes a `TypeError: try_running_module() got multiple values for argument 'cloudsmith_url'` issue we started running up against. --- upgrade/scripts/upgrade_python_package.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/upgrade/scripts/upgrade_python_package.py b/upgrade/scripts/upgrade_python_package.py index 1ac4cc7..04fbaff 100644 --- a/upgrade/scripts/upgrade_python_package.py +++ b/upgrade/scripts/upgrade_python_package.py @@ -73,9 +73,9 @@ def upgrade_and_run( module_name = package_name.replace("-", "_") try_running_module( module_name, + *args, cloudsmith_url=cloudsmith_url, slack_webhook_url=slack_webhook_url, - *args, ) return was_updated, response_err @@ -458,7 +458,7 @@ def split_package_name_and_extra(package_install_cmd): return package_name, extra -def try_running_module(wheel, cloudsmith_url=None, slack_webhook_url=None, *args): +def try_running_module(wheel, *args, **kwargs): file_name = os.path.basename(wheel) module_name = file_name.split("-", 1)[0] # don't try running the module if it does not exists @@ -468,7 +468,9 @@ def try_running_module(wheel, cloudsmith_url=None, slack_webhook_url=None, *args try: run_module_and_reload_uwsgi_app(module_name, *args) except Exception: + slack_webhook_url = kwargs.get("slack_webhook_url") if slack_webhook_url is not None: + cloudsmith_url = kwargs.get("cloudsmith_url") send_upgrade_notification( f"Failed to run module {module_name}", cloudsmith_url,