Skip to content

Commit e6d1aff

Browse files
Merge branch 'dev' into feat/webapp-status
2 parents d49109c + 911cfd6 commit e6d1aff

1,402 files changed

Lines changed: 203899 additions & 359315 deletions

File tree

Some content is hidden

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

.azure-pipelines/breaking-change-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ jobs:
2121
fetchDepth: 0
2222
fetchTags: true
2323
- task: UsePythonVersion@0
24-
displayName: 'Use Python 3.13'
24+
displayName: 'Use Python 3.14'
2525
inputs:
26-
versionSpec: 3.13
26+
versionSpec: '3.14'
2727
- template: ${{ variables.Pipeline.Workspace }}/.azure-pipelines/templates/azdev_setup.yml
2828
- bash: |
2929
set -ev

.azure-pipelines/macos-standalone-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ parameters:
2020
- name: PythonVersion
2121
displayName: 'Python Version (Homebrew)'
2222
type: string
23-
default: '3.13'
23+
default: '3.14'
2424

2525
# Sign/notarize parameters
2626
- name: BundleId

.azure-pipelines/templates/azdev_setup.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,16 @@ steps:
1515
python -m venv env
1616
chmod +x env/bin/activate
1717
. env/bin/activate
18-
python -m pip install -U pip
19-
pip install azdev
18+
# Cap setuptools<81 to match the CLI build (81 drops setup.py --dry-run,
19+
# 82 removes pkg_resources) so `azdev setup` builds under a supported
20+
# setuptools regardless of what the agent image ships.
21+
python -m pip install -U pip "setuptools<81"
22+
# azdev 0.2.11b1 decouples extension metadata generation from wheel==0.30.0
23+
# (see Azure/azure-cli-extensions#7740). It is not on PyPI yet, so install it
24+
# pinned to the azure-cli-dev-tools#549 merge commit (0.2.11b1) for a
25+
# reproducible build. Switch this to `pip install --upgrade "azdev==0.2.11b1"`
26+
# once the pre-release is published to PyPI.
27+
pip install --upgrade "git+https://github.com/Azure/azure-cli-dev-tools.git@49390f30c6a822620d2fbdf88889c4445d22666f#egg=azdev"
2028
azdev --version
2129
2230
if [ -z "$CLI_EXT_REPO_PATH" ]; then

.azure-pipelines/templates/macos/macos-build-jobs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Usage: Can be called from main pipeline or standalone wrapper
55
#
66
# Parameters:
7-
# - PythonVersion: Homebrew Python version (default: 3.13)
7+
# - PythonVersion: Homebrew Python version (default: 3.14)
88
# - MacosArm64Image: VM image for ARM64 builds
99
# - MacosIntelImage: VM image for Intel builds
1010
# - condition: Job execution condition
@@ -17,7 +17,7 @@
1717
parameters:
1818
- name: PythonVersion
1919
type: string
20-
default: '3.13'
20+
default: '3.14'
2121
- name: MacosArm64Image
2222
type: string
2323
default: 'macos-15-arm64'
@@ -62,7 +62,7 @@ jobs:
6262
echo "Architecture: $(Architecture)"
6363
brew install python@${{ parameters.PythonVersion }}
6464
65-
PYTHON_PATH=$(brew --prefix python@${{ parameters.PythonVersion }})/libexec/bin/python3
65+
PYTHON_PATH=$(brew --prefix python@${{ parameters.PythonVersion }})/libexec/bin/python
6666
echo "Python path: $PYTHON_PATH"
6767
$PYTHON_PATH --version
6868
@@ -171,7 +171,7 @@ jobs:
171171
brew install python@${{ parameters.PythonVersion }}
172172
fi
173173
174-
AZ_PYTHON="$(brew --prefix python@${{ parameters.PythonVersion }})/libexec/bin/python3"
174+
AZ_PYTHON="$(brew --prefix python@${{ parameters.PythonVersion }})/libexec/bin/python"
175175
export AZ_PYTHON
176176
177177
echo "System architecture: $(uname -m)"

.azure-pipelines/templates/macos/macos-cask-generation-and-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ parameters:
2727
default: 'macos-15'
2828
- name: PythonVersion
2929
type: string
30-
default: '3.13'
30+
default: '3.14'
3131
- name: GitHubRepo
3232
type: string
3333
default: 'placeholder/repo'
@@ -302,7 +302,7 @@ jobs:
302302
brew install python@${{ parameters.PythonVersion }}
303303
fi
304304
305-
AZ_PYTHON="$(brew --prefix python@${{ parameters.PythonVersion }})/libexec/bin/python3"
305+
AZ_PYTHON="$(brew --prefix python@${{ parameters.PythonVersion }})/libexec/bin/python"
306306
export AZ_PYTHON
307307
308308
export AZ_DEBUG=1

.azure-pipelines/templates/macos/macos-publish-jobs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ parameters:
4646
default: 'macos-15'
4747
- name: PythonVersion
4848
type: string
49-
default: '3.13'
49+
default: '3.14'
5050
- name: Debug
5151
type: boolean
5252
default: false

.azure-pipelines/templates/macos/macos-sign-notarize-jobs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ parameters:
3333
default: []
3434
- name: PythonVersion
3535
type: string
36-
default: '3.13'
36+
default: '3.14'
3737
- name: MacosArm64Image
3838
type: string
3939
default: 'macos-15-arm64'
@@ -713,7 +713,7 @@ jobs:
713713
echo "=== Functional Test ==="
714714
# Test CLI
715715
if brew list python@${{ parameters.PythonVersion }} &>/dev/null; then
716-
AZ_PYTHON="$(brew --prefix python@${{ parameters.PythonVersion }})/libexec/bin/python3"
716+
AZ_PYTHON="$(brew --prefix python@${{ parameters.PythonVersion }})/libexec/bin/python"
717717
export AZ_PYTHON
718718
export AZ_DEBUG=1
719719
if "$TEST_DIR/bin/az" version 2>&1 | head -5; then

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
/src/azure-cli/ @necusjz @DanielMicrosoft @yonzhan @bebound @jiasli
2525

2626
/src/azure-cli-core/setup.py @necusjz @DanielMicrosoft @yonzhan @bebound @jiasli @isra-fel @MaddyMicrosoft @notyashhh @xuming-ms @teresaritorto
27+
/src/azure-cli/setup.py @isra-fel @MaddyMicrosoft @notyashhh @xuming-ms @teresaritorto
2728
/src/azure-cli/requirements.*.txt @necusjz @DanielMicrosoft @yonzhan @bebound @jiasli @isra-fel @MaddyMicrosoft @notyashhh @xuming-ms @teresaritorto
2829

2930
/src/azure-cli/azure/cli/command_modules/acr/ @NoriZC @yanzhudd @teresaritorto @northtyphoon @rosanch

0 commit comments

Comments
 (0)