Skip to content

Commit c678080

Browse files
committed
merge main and resolve conflicts
2 parents a0e875e + 584e975 commit c678080

File tree

325 files changed

+61773
-16729
lines changed

Some content is hidden

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

325 files changed

+61773
-16729
lines changed

.github/CODEOWNERS

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,10 @@
320320
# PRLabel: %Operator Nexus - Network Cloud
321321
/sdk/networkcloud/ @Azure/azure-sdk-write-networkcloud
322322

323+
# ServiceLabel: %Planetary Computer
324+
# PRLabel: %Planetary Computer
325+
/sdk/planetarycomputer/ @mandarinamdar @chahibi
326+
323327
# AzureSdkOwners: @annatisch
324328
# ServiceLabel: %Azure Projects
325329
# ServiceOwners: @annatisch
@@ -859,4 +863,4 @@
859863
/eng/emitter-package-lock.json @mccoyp @catalinaperalta @iscai-msft
860864

861865
/pylintrc @l0lawrence @scbedd @mccoyp
862-
/sdk/**/ci.yml @msyyc @lmazuel
866+
/sdk/**/ci.yml @msyyc @lmazuel @scbedd

eng/ci_tools.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@ pkginfo==1.12.1.2
1111
pip==24.0
1212
typing-extensions==4.12.2
1313
pyproject-api==1.8.0
14-
cibuildwheel==2.16.5
14+
cibuildwheel==2.23.3
1515
importlib-metadata==8.5.0
1616
build==1.2.2.post1
17-
nh3<0.3; platform_python_implementation == "PyPy" and python_version == "3.9"
1817

1918
# requirements leveraged for testing
2019
pytest==8.3.5
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
description: 'Verify Setup'
3+
---
4+
5+
## Goal
6+
This tool verifies the developer's environment for SDK development and release tasks. It returns what requirements are missing for the specified languages and repo.
7+
8+
Your goal is to identify the project repo root, and pass in the `packagePath` to the Verify Setup tool. For a language repo, pass in the language of the repo.
9+
10+
## Examples
11+
- in `azure-sdk-for-js`, run `azsdk_verify_setup` with `(langs=javascript, packagePath=<path>/azure-sdk-for-js)`.
12+
- in `azure-sdk-for-python`, run `azsdk_verify_setup` with `(langs=python, packagePath=<path>/azure-sdk-for-python, venvPath=<path-to-venv>)`.
13+
14+
## Parameter Requirements
15+
WHENEVER Python is included in `langs`, BEFORE RUNNING `azsdk_verify_setup`, you MUST ASK THE USER TO SPECIFY WHICH virtual environment they want to check. DO NOT ASSUME THE VENV WITHOUT ASKING THE USER. After obtaining the `venvPath`, you can run the tool.
16+
17+
The user can specify multiple languages to check. If the user wants to check all languages, pass in ALL supported languages and STILL ASK for a `venvPath`. Passing in no languages will only check the core requirements.
18+
19+
## Output
20+
Display results in a user-friendly and concise format, highlighting any missing dependencies that need to be addressed.

eng/pipelines/templates/steps/analyze.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,14 @@ steps:
8989
condition: and(succeededOrFailed(), ne(variables['Skip.VerifySdist'],'true'))
9090
inputs:
9191
scriptPath: 'scripts/devops_tasks/dispatch_tox.py'
92-
arguments: '"$(TargetingString)" --service=${{parameters.ServiceDirectory}} --toxenv=verifysdist ${{ parameters.AdditionalTestArgs }}'
92+
arguments: '"$(TargetingString)" --disable-compatibility-filter --service=${{parameters.ServiceDirectory}} --toxenv=verifysdist ${{ parameters.AdditionalTestArgs }}'
9393

9494
- task: PythonScript@0
9595
displayName: 'Verify whl'
9696
condition: and(succeededOrFailed(), ne(variables['Skip.VerifyWhl'],'true'))
9797
inputs:
9898
scriptPath: 'scripts/devops_tasks/dispatch_tox.py'
99-
arguments: '"$(TargetingString)" --service=${{parameters.ServiceDirectory}} --toxenv=verifywhl ${{ parameters.AdditionalTestArgs }}'
99+
arguments: '"$(TargetingString)" --disable-compatibility-filter --service=${{parameters.ServiceDirectory}} --toxenv=verifywhl ${{ parameters.AdditionalTestArgs }}'
100100

101101
- template: run_mypy.yml
102102
parameters:
@@ -123,7 +123,7 @@ steps:
123123
displayName: 'Run Keyword Validation Check'
124124
inputs:
125125
scriptPath: 'scripts/devops_tasks/dispatch_tox.py'
126-
arguments: '"$(TargetingString)" --service=${{parameters.ServiceDirectory}} --toxenv=verify_keywords ${{ parameters.AdditionalTestArgs }}'
126+
arguments: '"$(TargetingString)" --disable-compatibility-filter --service=${{parameters.ServiceDirectory}} --toxenv=verify_keywords ${{ parameters.AdditionalTestArgs }}'
127127
condition: and(succeededOrFailed(), ne(variables['Skip.KeywordCheck'],'true'))
128128

129129
- template: ../steps/run_bandit.yml

eng/pipelines/templates/steps/run_bandit.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ steps:
1717
--mark_arg="${{ parameters.TestMarkArgument }}"
1818
--service="${{ parameters.ServiceDirectory }}"
1919
--toxenv="bandit"
20+
--disable-compatibility-filter
2021
--disablecov
2122
${{ parameters.AdditionalTestArgs }}
2223
env: ${{ parameters.EnvVars }}

eng/pipelines/templates/steps/run_black.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ steps:
1414
"$(TargetingString)"
1515
--service="${{ parameters.ServiceDirectory }}"
1616
--checks="black"
17+
--disable-compatibility-filter
1718
--filter-type="Omit_management"
1819
${{ parameters.AdditionalTestArgs }}
1920
env:

eng/pipelines/templates/steps/run_breaking_changes.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ steps:
1414
--mark_arg="${{ parameters.TestMarkArgument }}"
1515
--service="${{ parameters.ServiceDirectory }}"
1616
--toxenv="breaking"
17+
--disable-compatibility-filter
1718
--disablecov
1819
env: ${{ parameters.EnvVars }}
1920
condition: and(succeededOrFailed(), ne(variables['Skip.BreakingChanges'],'true'))

eng/pipelines/templates/steps/run_mypy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ steps:
1717
--service="${{ parameters.ServiceDirectory }}"
1818
--checks="mypy"
1919
--disablecov
20+
--disable-compatibility-filter
2021
${{ parameters.AdditionalTestArgs }}
2122
env:
2223
TOX_PIP_IMPL: "uv"

eng/pipelines/templates/steps/run_pylint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ steps:
1515
"$(TargetingString)"
1616
--service="${{ parameters.ServiceDirectory }}"
1717
--checks="pylint"
18+
--disable-compatibility-filter
1819
--filter-type="Omit_management"
1920
${{ parameters.AdditionalTestArgs }}
2021
env:

eng/pipelines/templates/steps/run_pyright.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ steps:
1717
--mark_arg="${{ parameters.TestMarkArgument }}"
1818
--service="${{ parameters.ServiceDirectory }}"
1919
--toxenv="pyright"
20+
--disable-compatibility-filter
2021
--disablecov
2122
${{ parameters.AdditionalTestArgs }}
2223
condition: and(succeededOrFailed(), ne(variables['Skip.Pyright'],'true'))
@@ -30,6 +31,7 @@ steps:
3031
--mark_arg="${{ parameters.TestMarkArgument }}"
3132
--service="${{ parameters.ServiceDirectory }}"
3233
--toxenv="verifytypes"
34+
--disable-compatibility-filter
3335
--disablecov
3436
${{ parameters.AdditionalTestArgs }}
3537
condition: and(succeededOrFailed(), ne(variables['Skip.Verifytypes'],'true'))

0 commit comments

Comments
 (0)