Skip to content

Commit aea6629

Browse files
Merge branch 'main' into wangamber/llmspeech-testerrorfix
2 parents 158620b + 5ade108 commit aea6629

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

eng/pipelines/templates/stages/1es-redirect.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ extends:
3636
- 1ES.PT.Tag-refs/tags/canary
3737
settings:
3838
skipBuildTagsForGitHubPullRequests: true
39+
networkIsolationPolicy: Permissive
3940
sdl:
4041
${{ if and(eq(variables['Build.DefinitionName'], 'python - core'), eq(variables['Build.SourceBranchName'], 'main'), eq(variables['System.TeamProject'], 'internal')) }}:
4142
autobaseline:

eng/pipelines/templates/steps/build-test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ steps:
3636

3737
- template: set-dev-build.yml
3838

39+
- ${{if eq(variables['System.TeamProject'], 'internal') }}:
40+
- template: ../steps/auth-dev-feed.yml
41+
parameters:
42+
DevFeedName: ${{ parameters.DevFeedName }}
43+
3944
- pwsh: |
4045
Write-Host (Get-Command python).Source
4146
$ErrorActionPreference = 'Stop'
@@ -57,11 +62,6 @@ steps:
5762
parameters:
5863
runProxy: false
5964

60-
- ${{if eq(variables['System.TeamProject'], 'internal') }}:
61-
- template: ../steps/auth-dev-feed.yml
62-
parameters:
63-
DevFeedName: ${{ parameters.DevFeedName }}
64-
6565
- ${{ parameters.BeforeTestSteps }}
6666

6767
- template: /eng/pipelines/templates/steps/seed-virtualenv-wheels.yml

eng/tools/azure-sdk-tools/devtools_testutils/aio/proxy_testcase_async.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
# --------------------------------------------------------------------------
66
import logging
77
import urllib.parse as url_parse
8-
from functools import wraps
98

109
from azure.core.exceptions import ResourceNotFoundError
1110
from azure.core.pipeline.policies import ContentDecodePolicy
@@ -99,7 +98,6 @@ async def test(...): ...
9998

10099
def _make_proxy_decorator_async(transports):
101100
def _decorator(test_func):
102-
@wraps(test_func)
103101
async def record_wrap(*args, **kwargs):
104102
# ---- your existing trimming/early-exit logic ----
105103
trimmed_kwargs = {k: v for k, v in kwargs.items()}

eng/tools/azure-sdk-tools/devtools_testutils/proxy_testcase.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import logging
88
import os
99
from typing import TYPE_CHECKING, Optional
10-
from functools import wraps
1110
import urllib.parse as url_parse
1211

1312
from azure.core.exceptions import HttpResponseError, ResourceNotFoundError
@@ -298,7 +297,6 @@ def test(...): ...
298297

299298
def _make_proxy_decorator(transports):
300299
def _decorator(test_func: "Callable"):
301-
@wraps(test_func)
302300
def record_wrap(*args, **kwargs):
303301
# ---- your existing trimming/early-exit logic ----
304302
trimmed_kwargs = {k: v for k, v in kwargs.items()}
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1+
# this is an experimental package and as such has some experimental dependencies
2+
# those dependencies come with some constraints that we need to work around here
3+
# httpx==0.23.3 and js==1.0 cannot be pulled into a non-CFS azdo feed due to a azdo specific limitation.
4+
# Simultaneously updating either of these dependencies requires a test update. pinning in place for now.
5+
https://azuresdkartifacts.z5.web.core.windows.net/python/distributions/distros/httpx-0.23.3-py3-none-any.whl
6+
https://azuresdkartifacts.z5.web.core.windows.net/python/distributions/distros/js-1.0.tar.gz
17
-e ../../../eng/tools/azure-sdk-tools
28
../azure-core
39
-e ../azure-core/tests/testserver_tests/coretestserver
4-
js
510
pyodide==0.19.0a1; python_version >= '3.8'
6-
httpx==0.23.3
711
urllib3>=2.0.0

0 commit comments

Comments
 (0)