From 73c98bc985b13ed14e2387e389b2cf5290495df4 Mon Sep 17 00:00:00 2001 From: Gavin Aguiar Date: Fri, 5 May 2023 15:59:31 -0500 Subject: [PATCH 1/9] 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 b3b7c7116d0d3090f06d18cce1bd37fb4eb1099a Mon Sep 17 00:00:00 2001 From: gavin-aguiar <80794152+gavin-aguiar@users.noreply.github.com> Date: Fri, 5 May 2023 17:16:24 -0500 Subject: [PATCH 2/9] Update Python SDK Version to 1.14.1b3 (#1232) * Update Python SDK Version to 1.14.1b3 * Update setup.py --------- Co-authored-by: AzureFunctionsPython --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 22b5cbc32..9c2cf26d9 100644 --- a/setup.py +++ b/setup.py @@ -106,7 +106,7 @@ ] INSTALL_REQUIRES = [ - "azure-functions==1.14.1b2", + "azure-functions==1.14.1b3", "python-dateutil~=2.8.2" ] From 4fc836bffa65ba38ba171add437109fbd40cba01 Mon Sep 17 00:00:00 2001 From: AzureFunctionsPython Date: Tue, 2 May 2023 21:44:29 +0000 Subject: [PATCH 3/9] Update Python Worker Version to 4.13.0 --- azure_functions_worker/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure_functions_worker/version.py b/azure_functions_worker/version.py index db1c21484..4021f66ed 100644 --- a/azure_functions_worker/version.py +++ b/azure_functions_worker/version.py @@ -1,4 +1,4 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. -VERSION = '4.12.0' +VERSION = '4.13.0' From b6dc4225778b0496c6cc345cdb89f8ff9e7cea62 Mon Sep 17 00:00:00 2001 From: AzureFunctionsPython Date: Mon, 8 May 2023 15:39:46 +0000 Subject: [PATCH 4/9] Update Python Worker Version to 4.14.0 --- azure_functions_worker/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure_functions_worker/version.py b/azure_functions_worker/version.py index 4021f66ed..e02b652e2 100644 --- a/azure_functions_worker/version.py +++ b/azure_functions_worker/version.py @@ -1,4 +1,4 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. -VERSION = '4.13.0' +VERSION = '4.14.0' From 1c77b24b9556bdea55c85293159b807c33c77125 Mon Sep 17 00:00:00 2001 From: Gavin Aguiar Date: Thu, 25 May 2023 13:42:14 -0500 Subject: [PATCH 5/9] Test fixes --- codecov.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/codecov.yml b/codecov.yml index 1881fd7dd..8ab006bd2 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1,3 +1,6 @@ ignore: - - "tests/utils/" + - "tests/utils/testutils.py" + - "tests/utils/testutils_lc.py" + - "tests/utils/testutils_docker.py" + - "tests/utils/constants.py" From 63cbcdecf5ef9d583d14a8a030b509bf7b3c8d3f Mon Sep 17 00:00:00 2001 From: Gavin Aguiar Date: Tue, 6 Jun 2023 22:13:51 -0500 Subject: [PATCH 6/9] Installing packages with -U --- .ci/e2e_integration_test/start-e2e.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/e2e_integration_test/start-e2e.ps1 b/.ci/e2e_integration_test/start-e2e.ps1 index bce329877..b30e76853 100644 --- a/.ci/e2e_integration_test/start-e2e.ps1 +++ b/.ci/e2e_integration_test/start-e2e.ps1 @@ -88,7 +88,7 @@ Write-Host "-------------------------------------------------------------------- Write-Host "Preparing E2E integration tests..." -ForegroundColor Green Write-Host "-----------------------------------------------------------------------------`n" -ForegroundColor Green python -m pip install -U pip -pip install -e .[dev] +pip install -e -U .[dev] python setup.py build python setup.py extension Write-Host "-----------------------------------------------------------------------------`n" -ForegroundColor Green From 702b4439541dc5120c455c50c73e5a54b575f91e Mon Sep 17 00:00:00 2001 From: Gavin Aguiar Date: Tue, 6 Jun 2023 22:23:09 -0500 Subject: [PATCH 7/9] Install packages with updates --- .ci/e2e_integration_test/start-e2e.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/e2e_integration_test/start-e2e.ps1 b/.ci/e2e_integration_test/start-e2e.ps1 index b30e76853..6e24fc66a 100644 --- a/.ci/e2e_integration_test/start-e2e.ps1 +++ b/.ci/e2e_integration_test/start-e2e.ps1 @@ -88,7 +88,7 @@ Write-Host "-------------------------------------------------------------------- Write-Host "Preparing E2E integration tests..." -ForegroundColor Green Write-Host "-----------------------------------------------------------------------------`n" -ForegroundColor Green python -m pip install -U pip -pip install -e -U .[dev] +python -m pip install -U -e .[dev] python setup.py build python setup.py extension Write-Host "-----------------------------------------------------------------------------`n" -ForegroundColor Green From c033fab660688981b28a3690b76eb184dd171cf4 Mon Sep 17 00:00:00 2001 From: Gavin Aguiar Date: Wed, 7 Jun 2023 10:50:27 -0500 Subject: [PATCH 8/9] Adding python -m to pytest --- .ci/e2e_integration_test/start-e2e.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/e2e_integration_test/start-e2e.ps1 b/.ci/e2e_integration_test/start-e2e.ps1 index 6e24fc66a..61e7f0bfe 100644 --- a/.ci/e2e_integration_test/start-e2e.ps1 +++ b/.ci/e2e_integration_test/start-e2e.ps1 @@ -97,5 +97,5 @@ Write-Host "-------------------------------------------------------------------- Write-Host "Running E2E integration tests..." -ForegroundColor Green Write-Host "-----------------------------------------------------------------------------`n" -ForegroundColor Green $env:CORE_TOOLS_EXE_PATH = "$funcExePath" -pytest --junitxml=e2e-integration-test-report.xml --reruns 4 tests/endtoend +python -m pytest --junitxml=e2e-integration-test-report.xml --reruns 4 tests/endtoend Write-Host "-----------------------------------------------------------------------------`n" -ForegroundColor Green From 58da026995e4af0a8a1bcaff3ff392349a7247b8 Mon Sep 17 00:00:00 2001 From: Gavin Aguiar Date: Wed, 7 Jun 2023 10:59:35 -0500 Subject: [PATCH 9/9] Reverting change to codecov.yml --- codecov.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/codecov.yml b/codecov.yml index 8ab006bd2..1881fd7dd 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1,6 +1,3 @@ ignore: - - "tests/utils/testutils.py" - - "tests/utils/testutils_lc.py" - - "tests/utils/testutils_docker.py" - - "tests/utils/constants.py" + - "tests/utils/"