Skip to content

Commit 8d57339

Browse files
committed
Merge branch 'main' into vector-search-policy-updates
2 parents dfe8e42 + caabbd1 commit 8d57339

File tree

4,854 files changed

+279835
-199185
lines changed

Some content is hidden

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

4,854 files changed

+279835
-199185
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@
6464
/sdk/eventhub/ @annatisch @kashifkhan @swathipil @l0lawrence
6565

6666
# ServiceLabel: %Storage
67+
# ServiceOwners: @jalauzon-msft @vincenttran-msft
68+
6769
# PRLabel: %Storage
6870
/sdk/storage/ @annatisch @jalauzon-msft @vincenttran-msft @weirongw23-msft
6971

@@ -873,9 +875,6 @@
873875
# ServiceLabel: %Service Attention %SQL - Replication & Failover
874876
#/<NotInRepo>/ @azureSQLGitHub
875877

876-
# ServiceLabel: %Service Attention %Storage
877-
#/<NotInRepo>/ @xgithubtriage
878-
879878
# ServiceLabel: %Service Attention %Storsimple
880879
#/<NotInRepo>/ @anoobbacker @ganzee @manuaery @patelkunal
881880

.github/workflows/event-processor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
if: ${{ github.event_name == 'issues' && github.event.action == 'opened' }}
3434
steps:
3535
- name: 'Az CLI login'
36-
uses: azure/login@v1
36+
uses: azure/login@v2
3737
with:
3838
client-id: ${{ secrets.AZURE_CLIENT_ID }}
3939
tenant-id: ${{ secrets.AZURE_TENANT_ID }}

.vscode/cspell.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1712,11 +1712,17 @@
17121712
]
17131713
},
17141714
{
1715-
"filename": "sdk/webpubsub/azure-messaging-webpubsubclient/azure/messaging/webpubsubclient/_client.py",
1715+
"filename": "sdk/webpubsub/azure-messaging-webpubsubclient/azure/messaging/webpubsubclient/**/_client.py",
17161716
"words": [
17171717
"awps"
17181718
]
17191719
},
1720+
{
1721+
"filename": "sdk/webpubsub/azure-messaging-webpubsubclient/stress/*.py",
1722+
"words": [
1723+
"psutil"
1724+
]
1725+
},
17201726
{
17211727
"filename": "sdk/contentsafety/azure-ai-contentsafety/azure/ai/contentsafety/*.py",
17221728
"words": [

doc/deprecation_process.md

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ This page describes how to mark a package deprecated on PyPI. You likely need to
66
they shouldn't use the package you used to release anymore.
77

88
The overall idea is that PyPI do not support an official deprecation logic. We concluded that the best way was:
9-
- Change the classifier as Inactive, to showcase in metadata that this package is longer worked on
10-
- Add a disclaimer on the main Readme file to explain deprecation, and guide to migration guide to other package as necessary
11-
- Push a [post release](https://peps.python.org/pep-0440/#post-releases) to PyPI
9+
- Change the classifier as `Inactive`, to showcase in metadata that this package is longer worked on
10+
- Add a disclaimer on the main Readme file to explain deprecation, and guide to migration guide to other package as necessary. While a migration guide should always be written, you may decide to postpone this work based on downloads numbers (found on [pypistats](https://pypistats.org/), [pype.tech](https://www.pepy.tech/), etc.) and internal knowledge of the usage of the package.
11+
- Push a new release to PyPI
12+
13+
**Important Note**: The best versioning approach would be to do a [post release](https://peps.python.org/pep-0440/#post-releases). However, due to some tooling issues at the moment, currently version should be the next beta, or the next patch version ([example](https://github.com/Azure/azure-sdk-for-python/commit/cf3bfed65a65fcbb4b5c93db89a221c2959c5bb4)). Follow those issues for details https://github.com/Azure/azure-sdk/issues/7479 and https://github.com/Azure/azure-sdk-tools/issues/5916.
1214

1315
# Step 1: Update in the repository
1416

@@ -19,15 +21,23 @@ Clone the repository and udpate the following files of your package:
1921
>
2022
> For migration instructions, see the [migration guide](https://aka.ms/azsdk/python/migrate/my-new-package).
2123
22-
- `CHANGELOG.MD` add a new post version with the current date, and the same disclaimer. For instance
24+
- `CHANGELOG.MD` add a new version with the current date, and the same disclaimer. For instance
2325

2426
> ## 1.2.3.post1 (2023-03-31)
2527
>
2628
> This package is no longer being maintained. Use the [azure-mynewpackage](https://pypi.org/project/azure-mynewpackage/) package instead.
2729
>
2830
> For migration instructions, see the [migration guide](https://aka.ms/azsdk/python/migrate/my-new-package).
31+
32+
or
33+
34+
> ## 1.2.4 (2023-03-31)
35+
>
36+
> This package is no longer being maintained. Use the [azure-mynewpackage](https://pypi.org/project/azure-mynewpackage/) package instead.
37+
>
38+
> For migration instructions, see the [migration guide](https://aka.ms/azsdk/python/migrate/my-new-package).
2939
30-
- `azure/mypackage/_version.py` : Change the version to the one used in the changelog (for instance `"1.2.3.post1"`). This file may be called `version.py` if your package is very old.
40+
- `azure/mypackage/_version.py` : Change the version to the one used in the changelog (for instance `"1.2.3.post1"` or `"1.2.4"`). This file may be called `version.py` if your package is very old.
3141
- `sdk_packaging.toml` : You need to add `auto_update = false` if not already present to avoid the bot overriding your changes
3242
- `setup.py` change the `Development Status` classifier to `Development Status :: 7 - Inactive`. **Important: This needs to be your LAST commit on the PR. More on this at the bottom of this page if you want details.**.
3343

@@ -44,5 +54,5 @@ Once the PR is merged, move to the next step.
4454

4555
A release here is the same as usual, triggering the release pipeline of you SDK. More instruction can be found at: https://aka.ms/azsdk/release-checklist
4656

47-
**Important Note**: As CI don't build Inactive projects right now, you can't build and release. This is a classical chicken and egg problem: we don't want to lose time on testing Inactive projects, but you need at least have one run of build to release the Inactive project. It's important then to pass the variable "BUILD_INACTIVE=true" while triggering the release pipeline. But doing this may uncover issues that were not seen in your initial PR as the CI was disabled. To avoid most of those problems, it's highly recommended that you put the commit with "Inactive" LAST in your PR. In other words, push all changes to Readme and ChangeLog, wait to confirm the CI is green, and when everything is clean, push finally "Inactive" in the `setup.py`
57+
**Important Note**: As CI don't build Inactive projects right now, you can't build and release. This is a classical chicken and egg problem: we don't want to lose time on testing Inactive projects, but you need at least have one run of build to release the Inactive project. It's important then to pass the variable `"BUILD_INACTIVE=true"` while triggering the release pipeline. But doing this may uncover issues that were not seen in your initial PR as the CI was disabled. To avoid most of those problems, it's highly recommended that you put the commit with "Inactive" LAST in your PR. In other words, push all changes to Readme and ChangeLog, wait to confirm the CI is green, and when everything is clean, push finally "Inactive" in the `setup.py`
4858

53.1 KB
Loading

doc/dev/private_package/get_private_package.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,14 @@ If there is no link in the figure above, it may be folded. You can also find it
3232

3333
![img.png](unreleased_package_guide_example3.png)
3434

35+
## 5.Build private package locally (backup solution)
36+
37+
Because of security issue, maybe there is no private link to download. Since there is still auto generated PR provided, you can build the private package locally based on the PR with [guidance](https://github.com/Azure/azure-sdk-for-python/wiki/Common-issues-about-Python-SDK#build-private-package-with-pr)
38+
39+
![img.png](auto_gen_PR.png)
40+
3541
# Note
3642

3743
## 1.private repo
3844

3945
In private repo [Azure/azure-rest-api-specs-pr](https://github.com/Azure/azure-rest-api-specs-pr), pipeline can be triggered **only when the target branch is `main`**
40-

eng/common/pipelines/templates/steps/detect-api-changes.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ steps:
2222
-RepoFullName $(Build.Repository.Name)
2323
-APIViewUri $(ApiChangeDetectRequestUrl)
2424
-ArtifactName ${{ parameters.ArtifactName }}
25+
-DevopsProject $(System.TeamProject)
2526
pwsh: true
2627
displayName: Detect API changes
2728
condition: and(succeededOrFailed(), eq(variables['Build.Reason'],'PullRequest'))

eng/common/pipelines/templates/steps/policheck.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ parameters:
55
ExclusionFilePath: "$(Build.SourcesDirectory)/eng/guardian-tools/policheck/PolicheckExclusions.xml"
66

77
steps:
8-
- task: AzurePowerShell@5
8+
- task: AzurePowerShell@5
99
displayName: 'Download Policheck Exclusion Database'
1010
inputs:
1111
azureSubscription: 'Azure SDK Artifacts'
@@ -14,7 +14,7 @@ steps:
1414
pwsh: true
1515
Inline: |
1616
azcopy copy "https://azuresdkartifacts.blob.core.windows.net/policheck/${{ parameters.ExclusionDataBaseFileName }}.mdb" "$(Build.BinariesDirectory)"
17-
env:
17+
env:
1818
AZCOPY_AUTO_LOGIN_TYPE: 'PSCRED'
1919

2020
- task: securedevelopmentteam.vss-secure-development-tools.build-task-policheck.PoliCheck@2

eng/common/scripts/Create-APIReview.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ function Upload-SourceArtifact($filePath, $apiLabel, $releaseStatus, $packageVer
7878
try
7979
{
8080
$Response = Invoke-WebRequest -Method 'POST' -Uri $uri -Body $multipartContent -Headers $headers
81+
Write-Host "API review: $($Response.Content)"
8182
$StatusCode = $Response.StatusCode
8283
}
8384
catch
@@ -114,6 +115,7 @@ function Upload-ReviewTokenFile($packageName, $apiLabel, $releaseStatus, $review
114115
try
115116
{
116117
$Response = Invoke-WebRequest -Method 'GET' -Uri $uri -Headers $headers
118+
Write-Host "API review: $($Response.Content)"
117119
$StatusCode = $Response.StatusCode
118120
}
119121
catch

eng/common/scripts/Detect-Api-Changes.ps1

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ Param (
1515
[string] $APIViewUri,
1616
[string] $RepoFullName = "",
1717
[string] $ArtifactName = "packages",
18-
[string] $TargetBranch = ("origin/${env:SYSTEM_PULLREQUEST_TARGETBRANCH}" -replace "refs/heads/")
18+
[string] $TargetBranch = ("origin/${env:SYSTEM_PULLREQUEST_TARGETBRANCH}" -replace "refs/heads/"),
19+
[string] $DevopsProject = "internal"
1920
)
2021

2122
. (Join-Path $PSScriptRoot common.ps1)
@@ -37,6 +38,7 @@ function Submit-Request($filePath, $packageName)
3738
$query.Add('pullRequestNumber', $PullRequestNumber)
3839
$query.Add('packageName', $packageName)
3940
$query.Add('language', $LanguageShort)
41+
$query.Add('project', $DevopsProject)
4042
$reviewFileFullName = Join-Path -Path $ArtifactPath $packageName $reviewFileName
4143
if (Test-Path $reviewFileFullName)
4244
{
@@ -87,6 +89,7 @@ function Log-Input-Params()
8789
Write-Host "Language: $($Language)"
8890
Write-Host "Commit SHA: $($CommitSha)"
8991
Write-Host "Repo Name: $($RepoFullName)"
92+
Write-Host "Project: $($DevopsProject)"
9093
}
9194

9295
Log-Input-Params

0 commit comments

Comments
 (0)