Skip to content

merge main branch #22421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
bc99c22
[Release issue status] Reduce max papallel (#22334)
msyyc Jan 5, 2022
f68dd95
[ServiceBus] fixed retry backoff (#22317)
swathipil Jan 5, 2022
1261d34
[formrecognizer] Fix test assert for changing description value (#22324)
catalinaperalta Jan 5, 2022
3694201
Update README.md (#22259)
BaherAbdullah Jan 5, 2022
1d2eccb
enable identity for py27 (#22341)
xiangyan99 Jan 5, 2022
1594062
drop py27 for ditital twins (#22343)
xiangyan99 Jan 5, 2022
af40372
[EventHub] drop python 2.7/3.6 (#22319)
swathipil Jan 5, 2022
3aa619e
[SchemaRegistry] drop 2.7/36 (#22318)
swathipil Jan 5, 2022
8068346
Sync eng/common directory with azure-sdk-tools for PR 2484 (#22346)
azure-sdk Jan 5, 2022
2344a63
[Key Vault] Skip tests failing with SAS issues (#22351)
mccoyp Jan 6, 2022
a6567a0
[AutoRelease] t2-consumption-2022-01-06-98359 (#22360)
azclibot Jan 6, 2022
218bf23
[AutoRelease] t2-streamanalytics-2022-01-06-51238 (#22356)
azclibot Jan 6, 2022
c2369a8
t2-netapp-2021-08-01 (#22316)
Jan 6, 2022
fd5f23c
[AutoRelease] t2-notificationhubs-2022-01-06-74264 (#22359)
azclibot Jan 6, 2022
0a54295
[Perf] Fix batch sizes in SampleBatchTest (#22352)
mikeharder Jan 6, 2022
f7bcfd7
Handle skipping docker build when PushImages is set and there is no d…
azure-sdk Jan 6, 2022
2b4af08
drop Python 2.7/3.6 (#22320)
swathipil Jan 6, 2022
9fbe42c
[Key Vault] Drop 2.7, 3.6 support (#22367)
mccoyp Jan 6, 2022
9307ad1
Fixed the printing message. (#22301)
sima-zhu Jan 6, 2022
9e22912
synapse artifacts jan updates (#22306)
xiangyan99 Jan 7, 2022
9a544e9
[AutoRelease] t2-compute-2022-01-06-94013 (#22364)
azclibot Jan 7, 2022
e358eb4
[ServiceBus&EventHubs] remove RetryMode enum (#22369)
swathipil Jan 7, 2022
ab90f30
delete web2021-02-01 (#22375)
BigCat20196 Jan 7, 2022
1afcf83
Hotfix for pipeline python version 2.7/3.6 task issues (#22363)
AikoBB Jan 7, 2022
372f18a
update to uamqp 1.5.0 (#22348)
yunhaoling Jan 7, 2022
bbb1b3a
revert the change of bumping dep version (#22382)
xiangyan99 Jan 7, 2022
6c5e122
[textanalytics] run pyupgrade on textanalytics (#22344)
kristapratico Jan 7, 2022
1c07a2e
[KV] Remove metapackage from ci.yml (#22385)
mccoyp Jan 7, 2022
7c4f4b0
Update README.md (#22345)
kristapratico Jan 7, 2022
8668461
Remove py27 and py36 from all test matrices. Leave py27 testing enabl…
scbedd Jan 7, 2022
60a7f62
[ServiceBus] expand kwargs in public API (#22353)
swathipil Jan 8, 2022
d98fa5b
Update text analytics live test config to support sovereign cloud tes…
benbp Jan 8, 2022
a24c4b6
[metricsadvisor] convert to test proxy (#21974)
kristapratico Jan 8, 2022
6b0495d
Sync eng/common directory with azure-sdk-tools for PR 2500 (#22395)
azure-sdk Jan 8, 2022
fcf7e0e
add assignee (#22400)
msyyc Jan 10, 2022
95a1220
[metricsadvisor] shorten recording names (#22412)
kristapratico Jan 10, 2022
32b5116
release failed because release date is too far away. (#22413)
giakas Jan 10, 2022
be2078e
disable detect api changes RE #22416 (#22417)
scbedd Jan 10, 2022
6bcfef9
Merge branch 'main' into feature/communication-CallingServer-preview
huachuandeng Jan 10, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This repository is for active development of the Azure SDK for Python. For consu

## _Disclaimer_

_Azure SDK Python packages support for Python 2.7 is ending 01 January 2022. For more information and questions, please refer to https://github.com/Azure/azure-sdk-for-python/issues/20691_
_Azure SDK Python packages support for Python 2.7 has ended 01 January 2022. For more information and questions, please refer to https://github.com/Azure/azure-sdk-for-python/issues/20691_

## Getting started

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ steps:
- script: >
dotnet tool install
Azure.Sdk.Tools.PipelineGenerator
--version 1.0.2-dev.20210621.4
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk/nuget/v3/index.json
--version 1.0.2-dev.20220106.2
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
--tool-path ${{parameters.ToolPath}}
workingDirectory: $(Pipeline.Workspace)/pipeline-generator
displayName: 'Install pipeline generator tool'
23 changes: 21 additions & 2 deletions eng/common/pipelines/templates/steps/prepare-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,26 @@ steps:
--debug
${{parameters.TestsConventionOptions}}
displayName: Create Live Test pipelines for public repository
condition: ne('${{parameters.TestsConventionOptions}}','')
condition: and(succeeded(), ne('${{parameters.TestsConventionOptions}}',''))
env:
PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)
- script: >
$(Pipeline.Workspace)/pipeline-generator/pipeline-generator
--organization https://dev.azure.com/azure-sdk
--project internal
--prefix ${{parameters.Prefix}}
--devopspath "\${{parameters.Prefix}}"
--path $(System.DefaultWorkingDirectory)/sdk
--endpoint Azure
--repository ${{parameters.Repository}}
--convention weekly
--agentpool Hosted
--branch refs/heads/$(DefaultBranch)
--patvar PATVAR
--debug
${{parameters.TestsConventionOptions}}
displayName: Create Weekly (Multi-Cloud) Live Test pipelines for public repository
condition: and(succeeded(), ne('${{parameters.TestsConventionOptions}}',''))
env:
PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)

Expand Down Expand Up @@ -132,6 +151,6 @@ steps:
--no-schedule
${{parameters.TestsConventionOptions}}
displayName: Create Live Test pipelines for private repository
condition: ne('${{parameters.TestsConventionOptions}}','')
condition: and(succeeded(), ne('${{parameters.TestsConventionOptions}}',''))
env:
PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,10 @@ function DeployStressPackage(
}
$imageTag += "/$($pkg.Namespace)/$($pkg.ReleaseName):${deployId}"

if ($pushImages) {
$dockerFilePath = "$($pkg.Directory)/Dockerfile"
if ($pushImages -and (Test-Path $dockerFilePath)) {
Write-Host "Building and pushing stress test docker image '$imageTag'"
$dockerFile = Get-ChildItem "$($pkg.Directory)/Dockerfile"
$dockerFile = Get-ChildItem $dockerFilePath
Run docker build -t $imageTag -f $dockerFile.FullName $dockerFile.DirectoryName
if ($LASTEXITCODE) { return }
Run docker push $imageTag
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,10 @@
"Agent": {
"ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }
},
"PythonVersion": [ "pypy3", "3.6", "3.7", "3.8", "3.9" ],
"PythonVersion": [ "pypy3", "3.7", "3.8", "3.9" ],
"CoverageArg": "--disablecov"
},
"include": [
{
"Agent": {
"macOS-10.15": { "OSVmImage": "macOS-10.15", "Pool": "Azure Pipelines" }
},
"PythonVersion": "2.7",
"CoverageArg": "--disablecov"
},
{
"Agent": {
"windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" }
},
"PythonVersion": "3.6",
"CoverageArg": "--disablecov"
},
{
"Config": {
"Ubuntu2004_310": {
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/stages/platform-matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" },
"macOS-10.15": { "OSVmImage": "macOS-10.15", "Pool": "Azure Pipelines" }
},
"PythonVersion": [ "pypy3", "2.7", "3.6", "3.7", "3.8" ],
"PythonVersion": [ "pypy3", "3.7", "3.8" ],
"CoverageArg": "--disablecov",
"TestSamples": "false"
},
Expand Down
7 changes: 4 additions & 3 deletions eng/pipelines/templates/steps/analyze.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,10 @@ steps:
parameters:
Artifacts: ${{ parameters.Artifacts }}

- template: /eng/common/pipelines/templates/steps/detect-api-changes.yml
parameters:
Artifacts: ${{ parameters.Artifacts }}
# Temporarily disabling due to #22416
# - template: /eng/common/pipelines/templates/steps/detect-api-changes.yml
# parameters:
# Artifacts: ${{ parameters.Artifacts }}

- template: /eng/common/pipelines/templates/steps/eng-common-workflow-enforcer.yml

Expand Down
19 changes: 11 additions & 8 deletions eng/scripts/Language-Settings.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -204,24 +204,27 @@ function DockerValidation{
[string]$workingDirectory
)
if ($PackageSourceOverride) {
docker run -v "${workingDirectory}:/workdir/out" -e TARGET_PACKAGE=$packageName -e TARGET_VERSION=$packageVersion `
-e EXTRA_INDEX_URL=$PackageSourceOverride -t $DocValidationImageId 2>&1 | Out-Null
Write-Host "docker run -v ${workingDirectory}:/workdir/out -e TARGET_PACKAGE=$packageName -e TARGET_VERSION=$packageVersion -e EXTRA_INDEX_URL=$PackageSourceOverride -t $DocValidationImageId"
$commandLine = docker run -v "${workingDirectory}:/workdir/out" -e TARGET_PACKAGE=$packageName -e TARGET_VERSION=$packageVersion `
-e EXTRA_INDEX_URL=$PackageSourceOverride -t $DocValidationImageId 2>&1
}
else {
docker run -v "${workingDirectory}:/workdir/out" `
-e TARGET_PACKAGE=$packageName -e TARGET_VERSION=$packageVersion -t $DocValidationImageId 2>&1 | Out-Null
Write-Host "docker run -v ${workingDirectory}:/workdir/out -e TARGET_PACKAGE=$packageName -e TARGET_VERSION=$packageVersion -t $DocValidationImageId"
$commandLine = docker run -v "${workingDirectory}:/workdir/out" `
-e TARGET_PACKAGE=$packageName -e TARGET_VERSION=$packageVersion -t $DocValidationImageId 2>&1
}
# The docker exit codes: https://docs.docker.com/engine/reference/run/#exit-status
# If the docker failed because of docker itself instead of the application,
# we should skip the validation and keep the packages.

if ($LASTEXITCODE -eq 125 -Or $LASTEXITCODE -eq 126 -Or $LASTEXITCODE -eq 127) {
Write-Host $commandLine
$commandLine | ForEach-Object { Write-Debug $_ }
LogWarning "The `docker` command does not work with exit code $LASTEXITCODE. Fall back to npm install $packageName directly."
FallbackValidation -packageName "$packageName" -packageVersion "$packageVersion" -workingDirectory $workingDirectory -PackageSourceOverride $PackageSourceOverride
}
elseif ($LASTEXITCODE -ne 0) {
Write-Host $commandLine
LogWarning "Package $($Package.name) ref docs validation failed."
$commandLine | ForEach-Object { Write-Debug $_ }
LogWarning "Package $packageName ref docs validation failed."
return $false
}
return $true
Expand Down Expand Up @@ -566,4 +569,4 @@ function Validate-Python-DocMsPackages ($PackageInfo, $PackageSourceOverride, $D
$packageVersion = $packageInfo.Version
ValidatePackage -packageName $packageName -packageVersion $packageVersion `
-PackageSourceOverride $PackageSourceOverride -DocValidationImageId $DocValidationImageId
}
}
2 changes: 2 additions & 0 deletions scripts/devops_tasks/test_run_samples.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@
"azure-ai-formrecognizer": [
"sample_manage_custom_models.py",
"sample_manage_custom_models_async.py",
"sample_copy_model.py",
"sample_copy_model_async.py",
],
"azure-ai-language-questionanswering": ["sample_chat.py"],
}
Expand Down
5 changes: 3 additions & 2 deletions scripts/release_issue_status/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
_FILE_OUT = 'release_issue_status.csv'
_FILE_OUT_PYTHON = 'release_python_status.md'
_PYTHON_SDK_ADMINISTRATORS = ['msyyc', 'BigCat20196']
_PYTHON_SDK_ASSIGNEES = ['BigCat20196']
_ASSIGNER_DICT = {'BigCat20196': os.getenv('JF_TOKEN')}
_PYTHON_SDK_ASSIGNEES = ['BigCat20196', 'msyyc']
_ASSIGNER_DICT = {'BigCat20196': os.getenv('JF_TOKEN'),
'msyyc': os.getenv('TOKEN')}
logging.basicConfig(level=logging.INFO,
format='[auto-reply log] - %(funcName)s[line:%(lineno)d] - %(levelname)s: %(message)s')

Expand Down
4 changes: 1 addition & 3 deletions scripts/release_issue_status/release_issue_status.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
displayName: ReleaseIssueStatus Python 3.8
timeoutInMinutes: 30
strategy:
maxParallel: 3
maxParallel: 1
pool:
vmImage: 'ubuntu-20.04'
steps:
Expand All @@ -47,8 +47,6 @@ jobs:
export URL=$(PIPELINE_URL)
export PIPELINE_TOKEN=$(PIPELINE-TOKEN)
export JF_TOKEN=$(Jiefeng-GitToken)
export ZED_TOKEN=$(Zed-GitToken)
export COOKIE=$(USR_TOKEN)

# create virtual env
python -m venv venv-sdk
Expand Down
2 changes: 1 addition & 1 deletion sdk/appconfiguration/azure-appconfiguration/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
classifiers=[
"Development Status :: 5 - Production/Stable",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
Expand Down

This file was deleted.

This file was deleted.

Loading