From 73c98bc985b13ed14e2387e389b2cf5290495df4 Mon Sep 17 00:00:00 2001 From: Gavin Aguiar Date: Fri, 5 May 2023 15:59:31 -0500 Subject: [PATCH 1/3] Revert "Added worker to pythonpath (#1215)" This reverts commit a60ef25cd77d0ad53f4c3fc0c233fc9e7db84b8c. --- python/prodV4/worker.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/python/prodV4/worker.py b/python/prodV4/worker.py index 609d02bcc..b3c0faf01 100644 --- a/python/prodV4/worker.py +++ b/python/prodV4/worker.py @@ -6,7 +6,6 @@ # User packages PKGS_PATH = "site/wwwroot/.python_packages" VENV_PKGS_PATH = "site/wwwroot/worker_venv" -WORKER_DIR = "azure_functions_worker" PKGS = "lib/site-packages" @@ -51,8 +50,6 @@ def determine_user_pkg_paths(): if __name__ == '__main__': # worker.py lives in the same directory as azure_functions_worker - current_dir = str(Path(__file__).absolute()) - worker_path = os.path.join(current_dir, WORKER_DIR) func_worker_dir = str(Path(__file__).absolute().parent) env = os.environ @@ -60,11 +57,11 @@ def determine_user_pkg_paths(): # third-party user packages over worker packages in PYTHONPATH user_pkg_paths = determine_user_pkg_paths() joined_pkg_paths = os.pathsep.join(user_pkg_paths) - env['PYTHONPATH'] = f'{worker_path}:{joined_pkg_paths}:{func_worker_dir}' + env['PYTHONPATH'] = f'{joined_pkg_paths}:{func_worker_dir}' if is_azure_environment(): os.execve(sys.executable, - [sys.executable, '-m', WORKER_DIR] + [sys.executable, '-m', 'azure_functions_worker'] + sys.argv[1:], env) else: From e62305415a42b9b6264ce162e461c2ce39966a92 Mon Sep 17 00:00:00 2001 From: Gavin Aguiar Date: Fri, 5 May 2023 16:01:38 -0500 Subject: [PATCH 2/3] Revert "Added worker to pythonpath (#1215)" This reverts commit a60ef25cd77d0ad53f4c3fc0c233fc9e7db84b8c. --- azure_functions_worker/worker.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 azure_functions_worker/worker.py diff --git a/azure_functions_worker/worker.py b/azure_functions_worker/worker.py new file mode 100644 index 000000000..e69de29bb From 42cff8e639dbdd2689d141ea631bce3717ab493f Mon Sep 17 00:00:00 2001 From: Gavin Aguiar Date: Fri, 5 May 2023 17:30:56 -0500 Subject: [PATCH 3/3] Deleted empty worker.py file --- azure_functions_worker/worker.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 azure_functions_worker/worker.py diff --git a/azure_functions_worker/worker.py b/azure_functions_worker/worker.py deleted file mode 100644 index e69de29bb..000000000