From 3864fab6d8da47607c567c18d649dc26a2e8c980 Mon Sep 17 00:00:00 2001 From: sclaw Date: Fri, 13 Dec 2024 10:20:13 -0500 Subject: [PATCH 1/2] fix huey consumer path discovery --- ripple1d/api/manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ripple1d/api/manager.py b/ripple1d/api/manager.py index 8a491e80..c3a10ea8 100644 --- a/ripple1d/api/manager.py +++ b/ripple1d/api/manager.py @@ -47,7 +47,7 @@ def start(self): if sys.platform != "win32": raise SystemError("API can only be run from a windows system") - huey_consumer_path = shutil.which("huey_consumer.py") + huey_consumer_path = os.path.join(os.path.dirname(sys.executable), "huey_consumer.py") if not huey_consumer_path: print("Error: huey consumer script was not discoverable.") From 41ffe9b5569cebaf69f529705f66769e31e407a3 Mon Sep 17 00:00:00 2001 From: sclaw Date: Fri, 13 Dec 2024 10:27:50 -0500 Subject: [PATCH 2/2] fix f-string --- ripple1d/utils/sqlite_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ripple1d/utils/sqlite_utils.py b/ripple1d/utils/sqlite_utils.py index 42e0c13d..c674bbfa 100644 --- a/ripple1d/utils/sqlite_utils.py +++ b/ripple1d/utils/sqlite_utils.py @@ -41,7 +41,7 @@ def insert_data( for row in data.itertuples(): if boundary_condition == "kwse": - if f"f_{int(row.us_flow)}-z_{str(row.ds_wse).replace(".","_")}" in missing_grids: + if f'f_{int(row.us_flow)}-z_{str(row.ds_wse).replace(".","_")}' in missing_grids: map_exist = 0 else: map_exist = 1