Skip to content

Commit ab5db18

Browse files
author
Evan Roman
committed
Merge remote-tracking branch 'origin/dev' into evanroman/eh-tests
2 parents 33e982c + c3899d8 commit ab5db18

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+3154
-162
lines changed

‎.flake8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
ignore = W503,E402,E731
77

88
exclude = .git, __pycache__, build, dist, .eggs, .github, .local, docs/,
9-
Samples, azure_functions_worker/protos/,
9+
Samples, azure_functions_worker/protos/, proxy_worker/protos/,
1010
azure_functions_worker/_thirdparty/typing_inspect.py,
1111
tests/unittests/test_typing_inspect.py,
1212
tests/unittests/broken_functions/syntax_error/main.py,

‎azure_functions_worker/protos/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
/_src
21
*_pb2.py
32
*_pb2_grpc.py

‎azure_functions_worker/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Copyright (c) Microsoft Corporation. All rights reserved.
22
# Licensed under the MIT License.
33

4-
VERSION = '4.35.0'
4+
VERSION = '4.36.1'

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ jobs:
2121
PYTHON_VERSION: '3.11'
2222
Python312:
2323
PYTHON_VERSION: '3.12'
24+
Python313:
25+
PYTHON_VERSION: '3.13'
2426
steps:
2527
- task: UsePythonVersion@0
2628
inputs:

‎eng/templates/jobs/ci-unit-tests.yml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ jobs:
1616
PYTHON_VERSION: '3.11'
1717
Python312:
1818
PYTHON_VERSION: '3.12'
19-
19+
Python313:
20+
PYTHON_VERSION: '3.13'
2021
steps:
2122
- task: UsePythonVersion@0
2223
inputs:
@@ -34,8 +35,24 @@ jobs:
3435
displayName: 'Install dependencies'
3536
condition: and(eq(variables.isSdkRelease, false), eq(variables.isExtensionsRelease, false), eq(variables['USETESTPYTHONSDK'], false), eq(variables['USETESTPYTHONEXTENSIONS'], false))
3637
- bash: |
37-
python -m pytest -q -n auto --dist loadfile --reruns 4 --instafail --cov=./azure_functions_worker --cov-report xml --cov-branch tests/unittests
38+
PY_VER="$(PYTHON_VERSION)"
39+
echo "Python version: $PY_VER"
40+
41+
# Extract minor version
42+
PY_MINOR="${PY_VER#*.}"
43+
44+
if [ "$PY_MINOR" -ge 13 ]; then
45+
echo "Running proxy_worker tests (Python >= 3.13)..."
46+
python -m pytest -q -n auto --dist loadfile --reruns 4 --instafail \
47+
--cov=./proxy_worker --cov-report xml --cov-branch tests/unittest_proxy
48+
else
49+
echo "Running unittests (Python < 3.13)..."
50+
python -m pytest -q -n auto --dist loadfile --reruns 4 --instafail \
51+
--cov=./azure_functions_worker --cov-report xml --cov-branch tests/unittests
52+
fi
3853
displayName: "Running $(PYTHON_VERSION) Unit Tests"
3954
# Skip running tests for SDK and Extensions release branches. Public pipeline doesn't have permissions to download artifact.
4055
condition: and(eq(variables.isSdkRelease, false), eq(variables.isExtensionsRelease, false), eq(variables['USETESTPYTHONSDK'], false), eq(variables['USETESTPYTHONEXTENSIONS'], false))
56+
env:
57+
PYTHON_VERSION: $(PYTHON_VERSION)
4158

‎eng/templates/official/jobs/build-artifacts.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ jobs:
2424
Python312V4:
2525
pythonVersion: '3.12'
2626
workerPath: 'python/prodV4/worker.py'
27+
Python313V4:
28+
pythonVersion: '3.13'
29+
workerPath: 'python/proxyV4/worker.py'
2730
templateContext:
2831
outputParentDirectory: $(Build.ArtifactStagingDirectory)
2932
outputs:
@@ -62,6 +65,9 @@ jobs:
6265
Python312V4:
6366
pythonVersion: '3.12'
6467
workerPath: 'python/prodV4/worker.py'
68+
Python313V4:
69+
pythonVersion: '3.13'
70+
workerPath: 'python/proxyV4/worker.py'
6571
templateContext:
6672
outputParentDirectory: $(Build.ArtifactStagingDirectory)
6773
outputs:
@@ -100,6 +106,9 @@ jobs:
100106
Python312V4:
101107
pythonVersion: '3.12'
102108
workerPath: 'python/prodV4/worker.py'
109+
Python313V4:
110+
pythonVersion: '3.13'
111+
workerPath: 'python/proxyV4/worker.py'
103112
templateContext:
104113
outputParentDirectory: $(Build.ArtifactStagingDirectory)
105114
outputs:
@@ -137,6 +146,9 @@ jobs:
137146
Python312V4:
138147
pythonVersion: '3.12'
139148
workerPath: 'python/prodV4/worker.py'
149+
Python313V4:
150+
pythonVersion: '3.13'
151+
workerPath: 'python/proxyV4/worker.py'
140152
templateContext:
141153
outputParentDirectory: $(Build.ArtifactStagingDirectory)
142154
outputs:
@@ -168,6 +180,9 @@ jobs:
168180
Python312V4:
169181
pythonVersion: '3.12'
170182
workerPath: 'python/prodV4/worker.py'
183+
Python313V4:
184+
pythonVersion: '3.13'
185+
workerPath: 'python/proxyV4/worker.py'
171186
templateContext:
172187
outputParentDirectory: $(Build.ArtifactStagingDirectory)
173188
outputs:

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

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,15 @@ jobs:
6363
SQL_CONNECTION: $(LinuxSqlConnectionString312)
6464
EVENTGRID_URI: $(LinuxEventGridTopicUriString312)
6565
EVENTGRID_CONNECTION: $(LinuxEventGridConnectionKeyString312)
66+
Python313:
67+
PYTHON_VERSION: '3.13'
68+
STORAGE_CONNECTION: $(LinuxStorageConnectionString312)
69+
COSMOSDB_CONNECTION: $(LinuxCosmosDBConnectionString312)
70+
EVENTHUB_CONNECTION: $(LinuxEventHubConnectionString312)
71+
SERVICEBUS_CONNECTION: $(LinuxServiceBusConnectionString312)
72+
SQL_CONNECTION: $(LinuxSqlConnectionString312)
73+
EVENTGRID_URI: $(LinuxEventGridTopicUriString312)
74+
EVENTGRID_CONNECTION: $(LinuxEventGridConnectionKeyString312)
6675
steps:
6776
- task: UsePythonVersion@0
6877
inputs:
@@ -120,7 +129,14 @@ jobs:
120129
Write-Host "pipelineVarSet: $pipelineVarSet"
121130
$branch = "$(Build.SourceBranch)"
122131
Write-Host "Branch: $branch"
123-
if($branch.StartsWith("refs/heads/sdk/") -or $pipelineVarSet -eq "true")
132+
133+
$PY_VER = "$(PYTHON_VERSION)"
134+
Write-Host "Python version: $PY_VER"
135+
# Extract minor version as integers
136+
$PY_MINO = "${PY_VER#*.}"
137+
Write-Host "Branch: PY_MINOR"
138+
139+
if($branch.StartsWith("refs/heads/sdk/") -or $pipelineVarSet -eq "true" -or $PY_MINOR -ge 13 )
124140
{
125141
Write-Host "##vso[task.setvariable variable=skipTest;]true"
126142
}
@@ -129,7 +145,6 @@ jobs:
129145
Write-Host "##vso[task.setvariable variable=skipTest;]false"
130146
}
131147
displayName: 'Set skipTest variable'
132-
condition: or(eq(variables.isSdkRelease, true), eq(variables['USETESTPYTHONSDK'], true))
133148
- powershell: |
134149
Write-Host "skipTest: $(skipTest)"
135150
displayName: 'Display skipTest variable'
@@ -145,4 +160,5 @@ jobs:
145160
AzureWebJobsEventGridTopicUri: $(EVENTGRID_URI)
146161
AzureWebJobsEventGridConnectionKey: $(EVENTGRID_CONNECTION)
147162
skipTest: $(skipTest)
163+
PYAZURE_WEBHOST_DEBUG: true
148164
displayName: "Running $(PYTHON_VERSION) Python E2E Tests"

‎pack/Microsoft.Azure.Functions.V4.PythonWorker.nuspec

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@
3838
<file src="..\3.12_LINUX_X64\**" target="tools\3.12\LINUX\X64" />
3939
<file src="..\3.12_OSX_X64\**" target="tools\3.12\OSX\X64" />
4040
<file src="..\3.12_OSX_X64\**" target="tools\3.12\OSX\Arm64" />
41+
<file src="..\3.13_WINDOWS_X64\**" target="tools\3.13\WINDOWS\X64" />
42+
<file src="..\3.13_WINDOWS_X86\**" target="tools\3.13\WINDOWS\X86" />
43+
<file src="..\3.13_LINUX_X64\**" target="tools\3.13\LINUX\X64" />
44+
<file src="..\3.13_OSX_X64\**" target="tools\3.13\OSX\X64" />
45+
<file src="..\3.13_OSX_X64\**" target="tools\3.13\OSX\Arm64" />
4146
<file src="..\python\prodV4\worker.config.json" target="tools" />
4247
<file src="Microsoft.Azure.Functions.PythonWorker.targets" target="build" />
4348
<file src="..\_manifest\spdx_2.2\manifest.spdx.json" target="SBOM\manifest.spdx.json" />

‎pack/scripts/mac_arm64_deps.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,10 @@ python -m invoke -c test_setup build-protos
1313

1414
cd ..
1515
cp .artifactignore "$BUILD_SOURCESDIRECTORY/deps"
16-
cp -r azure_functions_worker/protos "$BUILD_SOURCESDIRECTORY/deps/azure_functions_worker"
16+
17+
version_minor=$(echo $1 | cut -d '.' -f 2)
18+
if [[ $version_minor -lt 13 ]]; then
19+
cp -r azure_functions_worker/protos "$BUILD_SOURCESDIRECTORY/deps/azure_functions_worker"
20+
else
21+
cp -r proxy_worker/protos "$BUILD_SOURCESDIRECTORY/deps/proxy_worker"
22+
fi

‎pack/scripts/nix_deps.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,10 @@ python -m invoke -c test_setup build-protos
1313

1414
cd ..
1515
cp .artifactignore "$BUILD_SOURCESDIRECTORY/deps"
16-
cp -r azure_functions_worker/protos "$BUILD_SOURCESDIRECTORY/deps/azure_functions_worker"
16+
17+
version_minor=$(echo $1 | cut -d '.' -f 2)
18+
if [[ $version_minor -lt 13 ]]; then
19+
cp -r azure_functions_worker/protos "$BUILD_SOURCESDIRECTORY/deps/azure_functions_worker"
20+
else
21+
cp -r proxy_worker/protos "$BUILD_SOURCESDIRECTORY/deps/proxy_worker"
22+
fi

0 commit comments

Comments
 (0)