Merge branch 'dev' of https://github.com/Azure/azure-functions-python-worker into default

Author: lzchen

eng/ci/emulator-tests.yml

@@ -1,4 +1,9 @@
-trigger: none # ensure this is not ran as a CI build
+trigger: # run for sdk and extension release branches
+  batch: true
+  branches:
+    include:
+      - sdk/*
+      - extensions/*
 
 pr:
   branches:

eng/ci/public-build.yml

@@ -28,14 +28,6 @@ resources:
 
 variables:
   - template: /eng/templates/utils/variables.yml@self
-  - name: codeql.excludePathPatterns
-    value: deps/,build/
-  - name: codeql.compiled.enabled
-    value: true
-  - name: codeql.runSourceLanguagesInSourceAnalysis
-    value: true
-  - name: codeql.sourceLanguages
-    value: python, powershell
 
 extends:
   template: v1/1ES.Unofficial.PipelineTemplate.yml@1es
@@ -44,8 +36,18 @@ extends:
       name: 1es-pool-azfunc-public
       image: 1es-windows-2022
       os: windows
+
+    sdl:
+      codeql:
+        compiled:
+          enabled: true # still only runs for default branch
+        sourceLanguages: python, powershell
+        excludePathPatterns: deps/,build/
+        runSourceLanguagesInSourceAnalysis: true
+
     settings:
       skipBuildTagsForGitHubPullRequests: ${{ variables['System.PullRequest.IsFork'] }}
+
     stages:
     - stage: Build
       jobs:

eng/scripts/test-extensions.sh

@@ -2,11 +2,11 @@
 
 python -m pip install --upgrade pip
 if [[ $2 != "3.7" ]]; then
-    python -m pip install -e $1/PythonExtensionArtifact
+    python -m pip install -e $1/PythonExtensionArtifact/$3
     python -m pip install --pre -e .[test-http-v2]
 fi
 if [[ $2 != "3.7" && $2 != "3.8" ]]; then
-    python -m pip install -e $1/PythonExtensionArtifact
+    python -m pip install -e $1/PythonExtensionArtifact/$3
     python -m pip install --pre -U -e .[test-deferred-bindings]
 fi
 

eng/templates/jobs/ci-emulator-tests.yml

@@ -69,7 +69,7 @@ jobs:
           chmod +x eng/scripts/test-setup.sh
           chmod +x eng/scripts/test-extensions.sh
 
-          eng/scripts/test-extensions.sh $(Pipeline.Workspace) $(PYTHON_VERSION)
+          eng/scripts/test-extensions.sh $(Pipeline.Workspace) $(PYTHON_VERSION) $(PYTHONEXTENSIONNAME)
           eng/scripts/test-setup.sh
         displayName: 'Install test python extension, dependencies and the worker'
         condition: or(eq(variables.isExtensionsRelease, true), eq(variables['USETESTPYTHONEXTENSIONS'], true))

eng/templates/official/jobs/ci-e2e-tests.yml

@@ -111,7 +111,7 @@ jobs:
           chmod +x eng/scripts/test-setup.sh
           chmod +x eng/scripts/test-extensions.sh
 
-          eng/scripts/test-extensions.sh $(Pipeline.Workspace) $(PYTHON_VERSION)
+          eng/scripts/test-extensions.sh $(Pipeline.Workspace) $(PYTHON_VERSION) $(PYTHONEXTENSIONNAME)
           eng/scripts/test-setup.sh
         displayName: 'Install test python extension, dependencies and the worker'
         condition: or(eq(variables.isExtensionsRelease, true), eq(variables['USETESTPYTHONEXTENSIONS'], true))

pyproject.toml

@@ -78,7 +78,7 @@ test-http-v2 = [
     "orjson"
 ]
 test-deferred-bindings = [
-    "azurefunctions-extensions-bindings-blob==1.0.0b2"
+    "azurefunctions-extensions-bindings-blob==1.0.0b3"
 ]
 
 [build-system]

python/prodV4/worker.config.json

@@ -9,5 +9,9 @@
         "defaultExecutablePath":"python",
         "defaultWorkerPath":"%FUNCTIONS_WORKER_RUNTIME_VERSION%/{os}/{architecture}/worker.py",
         "workerIndexing": "true"
+    },
+     "processOptions": {
+        "initializationTimeout": "00:02:00",
+        "environmentReloadTimeout": "00:02:00"
     }
 }

python/test/worker.config.json

@@ -5,5 +5,9 @@
         "defaultExecutablePath":"python",
         "defaultWorkerPath":"worker.py",
         "workerIndexing": "true"
+    },
+     "processOptions": {
+        "initializationTimeout": "00:02:00",
+        "environmentReloadTimeout": "00:02:00"
     }
 }