Skip to content

Commit 0e46bf8

Browse files
committed
Resolve merge conflicts by updating pyproject.toml files and removing setup.py
2 parents 68a2bba + df69aa2 commit 0e46bf8

File tree

332 files changed

+50228
-2491
lines changed

Some content is hidden

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

332 files changed

+50228
-2491
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
/sdk/monitor/azure-monitor-ingestion/ @pvaneck @Azure/azure-sdk-write-monitor-data-plane
180180

181181
# PRLabel: %Monitor
182-
/sdk/monitor/azure-monitor-query/ @pvaneck @Azure/azure-sdk-write-monitor-data-plane
182+
/sdk/monitor/azure-monitor-query/ @Azure/azure-sdk-write-monitor-query-logs
183183

184184
# PRLabel: %Monitor
185185
/sdk/monitor/azure-monitor-querymetrics/ @Azure/azure-sdk-write-monitor-query-metrics

eng/apiview_reqs.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ tomli==2.2.1
1414
tomlkit==0.13.2
1515
typing_extensions==4.12.2
1616
wrapt==1.17.2
17-
apiview-stub-generator==0.3.20
17+
apiview-stub-generator==0.3.21

eng/common/TestResources/New-TestResources.ps1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,11 @@ param (
129129

130130
$wellKnownTMETenants = @('70a036f6-8e4d-4615-bad6-149c02e7720d')
131131

132+
# People keep passing this legacy parameter. Throw an error to save them future keystrokes
133+
if ($NewTestResourcesRemainingArguments -like '*UserAuth*') {
134+
throw "The -UserAuth parameter is deprecated and is now the default behavior"
135+
}
136+
132137
if (!$ServicePrincipalAuth) {
133138
# Clear secrets if not using Service Principal auth. This prevents secrets
134139
# from being passed to pre- and post-scripts.

eng/common/spelling/Invoke-Cspell.ps1

100644100755
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#!/usr/bin/env pwsh
2+
13
<#
24
.SYNOPSIS
35
Invokes cspell using dependencies defined in adjacent ./package*.json

eng/common/spelling/README.md

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
# Spelling Check Scripts
2+
3+
This directory contains a script to run cspell (Code Spell Checker) on the repository using the dependencies defined in the adjacent `package*.json` files.
4+
5+
## Adding Legitimate Words
6+
7+
If the spell checker flags legitimate words as misspelled, you can add them to the dictionary configuration file located at `.vscode/cspell.json`.
8+
9+
### Where to Add Words
10+
11+
There are two main places to add legitimate words. Maintain alphabetical order when adding words to keep the dictionary organized:
12+
13+
1. **Root-level words array**: Add words to the `"words"` array at the root level of the configuration file. This is the preferred location for project-specific terms, technical vocabulary, and commonly used words.
14+
15+
2. **Baseline dictionary**: Add words to the `"baseline"` dictionary under `"dictionaryDefinitions"`. This is typically used for words that were already present in the codebase when the spell checker was first introduced.
16+
17+
18+
### Example
19+
20+
To add new words, edit `.vscode/cspell.json` and add them to the `"words"` array:
21+
22+
```json
23+
{
24+
"words": [
25+
"myprojectname",
26+
"customterm",
27+
"technicalword"
28+
]
29+
}
30+
```
31+
32+
### Guidelines
33+
34+
- Use lowercase for words
35+
- Consider whether the word is truly legitimate or if it might be a typo
36+
37+
## Available Scripts
38+
39+
### PowerShell Version (Windows)
40+
- **File**: `Invoke-Cspell.ps1`
41+
- **Usage**: For Windows PowerShell environments
42+
43+
## Usage Examples
44+
45+
```powershell
46+
# Check all files (default)
47+
./eng/common/spelling/Invoke-Cspell.ps1
48+
49+
# Check specific files
50+
./eng/common/spelling/Invoke-Cspell.ps1 -ScanGlobs 'sdk/*/*/PublicAPI/**/*.md'
51+
52+
# Check multiple globs (powershell invocation only)
53+
./eng/common/spelling/Invoke-Cspell.ps1 -ScanGlobs @('sdk/storage/**', 'sdk/keyvault/**')
54+
55+
# Check single file
56+
./eng/common/spelling/Invoke-Cspell.ps1 -ScanGlobs './README.md'
57+
```
58+
59+
## Parameters
60+
61+
- **Job Type**: The cspell command to run (default: `lint`)
62+
- **Scan Globs**: File patterns to check for spelling
63+
- **Config Path**: Location of the cspell.json configuration file
64+
- **Spell Check Root**: Root directory for relative paths
65+
- **Package Cache**: Working directory for npm dependencies
66+
- **Leave Cache**: Option to preserve the npm package cache
67+
68+
## Requirements
69+
70+
- Node.js and npm must be installed
71+
- The `.vscode/cspell.json` configuration file must exist
72+
- `jq` command-line JSON processor (for bash version)
73+
74+
## How It Works
75+
76+
1. Creates a temporary working directory for npm packages
77+
2. Copies `package.json` and `package-lock.json` to the working directory
78+
3. Installs npm dependencies using `npm ci`
79+
4. Modifies the cspell configuration to include specified file globs
80+
5. Runs cspell with the modified configuration
81+
6. Restores the original configuration
82+
7. Cleans up temporary files
83+
84+
The scripts ensure that a LICENSE file (or temporary file) is always included in the scan to meet cspell's requirements for the "files" array.

0 commit comments

Comments
 (0)