Skip to content

Commit d9e25eb

Browse files
authored
Merge branch 'dev' into hallvictoria/generic-typing
2 parents 07239b4 + 1439372 commit d9e25eb

File tree

31 files changed

+295
-107
lines changed

31 files changed

+295
-107
lines changed

eng/ci/official-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,4 +115,4 @@ extends:
115115
parameters:
116116
PROJECT_NAME: 'Python V1 Library'
117117
PROJECT_DIRECTORY: 'runtimes/v1'
118-
PoolName: 1es-pool-azfunc
118+
PoolName: 1es-pool-azfunc

eng/ci/worker-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ extends:
5050
- template: /eng/templates/official/jobs/publish-library-release.yml@self
5151
parameters:
5252
PROJECT_DIRECTORY: 'runtimes/v2'
53+
VERSION_FILE: 'runtimes/v2/azure_functions_runtime/version.py'
5354
PROJECT_NAME: 'azure-functions-runtime'
5455
BRANCH_NAME: 'release-v2'
55-
TEST_BRANCH_NAME: 'test-release-v2'
5656
condition: eq(${{ parameters.V2LibraryRelease }}, True)
5757
- stage: ReleasePythonV1Library
5858
dependsOn: []
@@ -61,7 +61,7 @@ extends:
6161
- template: /eng/templates/official/jobs/publish-library-release.yml@self
6262
parameters:
6363
PROJECT_DIRECTORY: 'runtimes/v1'
64+
VERSION_FILE: 'runtimes/v1/azure_functions_runtime_v1/version.py'
6465
PROJECT_NAME: 'azure-functions-runtime-v1'
6566
BRANCH_NAME: 'release-v1'
66-
TEST_BRANCH_NAME: 'test-release-v1'
6767
condition: eq(${{ parameters.V1LibraryRelease }}, True)

eng/pack/scripts/nix_arm64_deps.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ docker rm my-arm64-container
4141
copy_list=(
4242
"azure"
4343
"azure_functions_worker"
44+
"azure_functions_runtime"
45+
"azure_functions_runtime_v1"
4446
"azurefunctions"
4547
"dateutil"
4648
"google"

eng/scripts/test-extensions.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#!/bin/bash
22

3-
cd workers
43
python -m pip install --upgrade pip
54
if [[ $2 != "3.7" ]]; then
65
python -m pip install -e $1/PythonExtensionArtifact/$3

eng/scripts/test-sdk.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#!/bin/bash
22

3-
cd workers
43
python -m pip install --upgrade pip
54
python -m pip install -e $1/PythonSdkArtifact
65
python -m pip install -e workers/[dev]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
docker compose -f ${{ parameters.PROJECT_DIRECTORY }}/tests/emulator_tests/utils/eventhub/docker-compose.yml up -d
8989
displayName: 'Install Azurite and Start EventHub Emulator'
9090
- bash: |
91-
python -m pytest -q -n auto --dist loadfile --reruns 4 --ignore=tests/emulator_tests/test_servicebus_functions.py tests/emulator_tests
91+
python -m pytest -q --dist loadfile --reruns 4 --ignore=tests/emulator_tests/test_servicebus_functions.py tests/emulator_tests
9292
env:
9393
AzureWebJobsStorage: "UseDevelopmentStorage=true"
9494
AzureWebJobsEventHubConnectionString: $(EmulatorEventHubConnectionString)
@@ -107,7 +107,7 @@ jobs:
107107
AzureWebJobsSQLPassword: $(AzureWebJobsSQLPassword)
108108
displayName: 'Install Azurite and Start ServiceBus Emulator'
109109
- bash: |
110-
python -m pytest -q -n auto --dist loadfile --reruns 4 tests/emulator_tests/test_servicebus_functions.py
110+
python -m pytest -q --dist loadfile --reruns 4 tests/emulator_tests/test_servicebus_functions.py
111111
env:
112112
AzureWebJobsStorage: "UseDevelopmentStorage=true"
113113
AzureWebJobsServiceBusConnectionString: $(EmulatorServiceBusConnectionString)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
eng/scripts/install-dependencies.sh $(PYTHON_VERSION) ${{ parameters.PROJECT_DIRECTORY }}
3030
displayName: 'Install dependencies'
3131
- bash: |
32-
python -m pytest -q -n auto --dist loadfile --reruns 4 --instafail --cov=./${{ parameters.PROJECT_DIRECTORY }} --cov-report xml --cov-branch tests/unittests
32+
python -m pytest -q --dist loadfile --reruns 4 --instafail --cov=./${{ parameters.PROJECT_DIRECTORY }} --cov-report xml --cov-branch tests/unittests
3333
displayName: "Running $(PYTHON_VERSION) Unit Tests"
3434
env:
3535
AzureWebJobsStorage: $(LinuxStorageConnectionString312)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ jobs:
5151
5252
if [ "$PY_MINOR" -ge 13 ]; then
5353
echo "Running proxy_worker tests (Python >= 3.13)..."
54-
python -m pytest -q -n auto --dist loadfile --reruns 4 --instafail \
54+
python -m pytest -q --dist loadfile --reruns 4 --instafail \
5555
--cov=./proxy_worker --cov-report xml --cov-branch tests/unittest_proxy
5656
else
5757
echo "Running unittests (Python < 3.13)..."
58-
python -m pytest -q -n auto --dist loadfile --reruns 4 --instafail \
58+
python -m pytest -q --dist loadfile --reruns 4 --instafail \
5959
--cov=./azure_functions_worker --cov-report xml --cov-branch tests/unittests
6060
fi
6161
displayName: "Running $(PYTHON_VERSION) Unit Tests"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ jobs:
153153
Write-Host "skipTest: $(skipTest)"
154154
displayName: 'Display skipTest variable'
155155
- bash: |
156-
python -m pytest -q -n auto --dist loadfile --reruns 4 --cov=./azure_functions_worker --cov-report xml --cov-branch --cov-append tests/endtoend tests/extension_tests/deferred_bindings_tests tests/extension_tests/http_v2_tests
156+
python -m pytest -q --dist loadfile --reruns 4 --cov=./azure_functions_worker --cov-report xml --cov-branch --cov-append tests/endtoend tests/extension_tests/deferred_bindings_tests tests/extension_tests/http_v2_tests
157157
env:
158158
AzureWebJobsStorage: $(STORAGE_CONNECTION)
159159
AzureWebJobsCosmosDBConnectionString: $(COSMOSDB_CONNECTION)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
displayName: 'Display CONTAINER_SAS_TOKEN variable'
101101
102102
- bash: |
103-
python -m pytest -n auto --dist loadfile -vv --instafail tests/consumption_tests
103+
python -m pytest --dist loadfile -vv --instafail tests/consumption_tests
104104
env:
105105
AzureWebJobsStorage: $(AZURE_STORAGE_CONNECTION_STRING)
106106
_DUMMY_CONT_KEY: $(_DUMMY_CONT_KEY)

0 commit comments

Comments
 (0)