Skip to content

Commit 217dabc

Browse files
committed
Merged main
1 parent c6e2f1b commit 217dabc

File tree

649 files changed

+25945
-21517
lines changed

Some content is hidden

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

649 files changed

+25945
-21517
lines changed

doc/analyze_check_versions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This table is to clarify the currently pinned version of tools we run in CI and
66
| Tool | Current Version | Next Version | Next Version Merge Date |
77
|------|-----------------|--------------|-------------------------|
88
Pylint | 3.2.5 | 3.2.7 | 2025-01-13 |
9-
MyPy | 1.10.1 | TBD | 2025-01-13 |
10-
Pyright | 1.1.371 | TBD | 2025-01-13 |
9+
MyPy | 1.10.1 | 1.13.0 | 2025-01-13 |
10+
Pyright | 1.1.371 | 1.1.389 | 2025-01-13 |
1111
Sphinx | 7.3.7 | N/A | N/A |
1212
Black | 24.4.0 | N/A | N/A |

doc/eng_sys_checks.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ This is the most useful skip, but the following skip variables are also supporte
112112
- Omit checking that a package's dependencies are on PyPI before releasing.
113113
- `Skip.KeywordCheck`
114114
- Omit checking that a package's keywords are correctly formulated before releasing.
115+
- `Skip.Black`
116+
- Omit checking `black` in the `analyze` job.
115117

116118
## The pyproject.toml
117119

@@ -172,7 +174,7 @@ You can enable test logging in a pipeline by setting the queue time variable `PY
172174

173175
`PYTEST_LOG_LEVEL=INFO`
174176

175-
This also works locally with tox by setting the `PYTEST_LOG_LEVEL` environment variable.
177+
This also works locally with tox by setting the `PYTEST_LOG_LEVEL` environment variable.
176178

177179
Note that if you want DEBUG level logging with sensitive information unredacted in the test logs, then you still must pass `logging_enable=True` into the client(s) being used in tests.
178180

@@ -237,17 +239,17 @@ fail if docstring are invalid, helping to ensure the resulting documentation wil
237239

238240
#### Opt-in to formatting validation
239241

240-
Make the following change to your projects `ci.yml`:
242+
Ensure that `black = true` is present within your `pyproject.toml`:
241243

242244
```yml
243-
extends:
244-
template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
245-
parameters:
246-
...
247-
ValidateFormatting: true
248-
...
245+
[tool.azure-sdk-build]
246+
...other checks enabled/disabled
247+
black = true
248+
...other checks enabled/disabled
249249
```
250250

251+
to opt into the black invocation.
252+
251253
#### Running locally
252254

253255
1. Go to package root directory.

eng/common/scripts/Cadl-Project-Generate.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ param (
1212
$ErrorActionPreference = "Stop"
1313
. $PSScriptRoot/Helpers/PSModule-Helpers.ps1
1414
. $PSScriptRoot/common.ps1
15-
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.1" | Import-Module
15+
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.7" | Import-Module
1616

1717
function NpmInstallForProject([string]$workingDirectory) {
1818
Push-Location $workingDirectory

eng/common/scripts/Cadl-Project-Sync.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ param (
99

1010
$ErrorActionPreference = "Stop"
1111
. $PSScriptRoot/Helpers/PSModule-Helpers.ps1
12-
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.1" | Import-Module
12+
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.7" | Import-Module
1313
$sparseCheckoutFile = ".git/info/sparse-checkout"
1414

1515
function AddSparseCheckoutPath([string]$subDirectory) {

eng/common/scripts/Helpers/ApiView-Helpers.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ function Process-ReviewStatusCode($statusCode, $packageName, $apiApprovalStatus,
7474
{
7575
$apiApproved = $false
7676
$apiApprovalDetails = "API Review is not approved for package $($packageName). Release pipeline will fail if API review is not approved for a GA version release. You can check http://aka.ms/azsdk/engsys/apireview/faq for more details on API Approval."
77+
$apiApprovalDetails += " Once your API is approved, re-trigger the release pipeline again."
7778

7879
$packageNameApproved = $false
7980
$packageNameApprovalDetails = ""
@@ -115,4 +116,4 @@ function Process-ReviewStatusCode($statusCode, $packageName, $apiApprovalStatus,
115116

116117
$packageNameStatus.IsApproved = $packageNameApproved
117118
$packageNameStatus.Details = $packageNameApprovalDetails
118-
}
119+
}

eng/common/scripts/Helpers/Package-Helpers.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ function CompatibleConvertFrom-Yaml {
8080
$yqPresent = Get-Command 'yq' -ErrorAction SilentlyContinue
8181
if (-not $yqPresent) {
8282
. (Join-Path $PSScriptRoot PSModule-Helpers.ps1)
83-
Install-ModuleIfNotInstalled -WhatIf:$false "powershell-yaml" "0.4.1" | Import-Module
83+
Install-ModuleIfNotInstalled -WhatIf:$false "powershell-yaml" "0.4.7" | Import-Module
8484
}
8585

8686
# Process the content (for example, you could convert from YAML here)

eng/common/scripts/TypeSpec-Project-Generate.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ $ErrorActionPreference = "Stop"
1313
. $PSScriptRoot/Helpers/PSModule-Helpers.ps1
1414
. $PSScriptRoot/Helpers/CommandInvocation-Helpers.ps1
1515
. $PSScriptRoot/common.ps1
16-
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.1" | Import-Module
16+
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.7" | Import-Module
1717

1818
function NpmInstallForProject([string]$workingDirectory) {
1919
Push-Location $workingDirectory

eng/common/scripts/TypeSpec-Project-Process.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ param (
1414

1515
. $PSScriptRoot/common.ps1
1616
. $PSScriptRoot/Helpers/PSModule-Helpers.ps1
17-
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.1" | Import-Module
17+
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.7" | Import-Module
1818

1919
function CreateUpdate-TspLocation([System.Object]$tspConfig, [string]$TypeSpecProjectDirectory, [string]$CommitHash, [string]$repo, [string]$repoRoot, [ref]$isNewSdkProject) {
2020
$additionalDirs = @()
@@ -225,4 +225,4 @@ if ($SkipSyncAndGenerate -and !$isNewSdkProject) {
225225
}
226226
}
227227

228-
return $sdkProjectFolder
228+
return $sdkProjectFolder

eng/common/scripts/TypeSpec-Project-Sync.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ param (
1111

1212
$ErrorActionPreference = "Stop"
1313
. $PSScriptRoot/Helpers/PSModule-Helpers.ps1
14-
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.1" | Import-Module
14+
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.7" | Import-Module
1515
$sparseCheckoutFile = ".git/info/sparse-checkout"
1616

1717
function AddSparseCheckoutPath([string]$subDirectory) {

eng/common/scripts/Update-DocsMsToc.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ param(
5555
. $PSScriptRoot/common.ps1
5656
. $PSScriptRoot/Helpers/PSModule-Helpers.ps1
5757

58-
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.1" | Import-Module
58+
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.7" | Import-Module
5959

6060
Set-StrictMode -Version 3
6161

0 commit comments

Comments
 (0)