From 7b3496c0d47c8e8582e6ce7669b749fc7a4f0fea Mon Sep 17 00:00:00 2001 From: ZelinWang Date: Mon, 27 Oct 2025 10:21:25 +0800 Subject: [PATCH 1/6] {Packaging} Add pyproject.toml to azure-cli, azure-cli-core, azure-cli-telemetry, azure-cli-testsdk and tools Add PEP 517 build-system files declaring requires = ["setuptools>=64", "wheel"] and build-backend = "setuptools.build_meta". --- src/azure-cli-core/pyproject.toml | 3 +++ src/azure-cli-telemetry/pyproject.toml | 3 +++ src/azure-cli-testsdk/pyproject.toml | 3 +++ src/azure-cli/pyproject.toml | 3 +++ tools/pyproject.toml | 3 +++ 5 files changed, 15 insertions(+) create mode 100644 src/azure-cli-core/pyproject.toml create mode 100644 src/azure-cli-telemetry/pyproject.toml create mode 100644 src/azure-cli-testsdk/pyproject.toml create mode 100644 src/azure-cli/pyproject.toml create mode 100644 tools/pyproject.toml diff --git a/src/azure-cli-core/pyproject.toml b/src/azure-cli-core/pyproject.toml new file mode 100644 index 00000000000..737e278f1ab --- /dev/null +++ b/src/azure-cli-core/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["setuptools>=64", "wheel"] +build-backend = "setuptools.build_meta" \ No newline at end of file diff --git a/src/azure-cli-telemetry/pyproject.toml b/src/azure-cli-telemetry/pyproject.toml new file mode 100644 index 00000000000..737e278f1ab --- /dev/null +++ b/src/azure-cli-telemetry/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["setuptools>=64", "wheel"] +build-backend = "setuptools.build_meta" \ No newline at end of file diff --git a/src/azure-cli-testsdk/pyproject.toml b/src/azure-cli-testsdk/pyproject.toml new file mode 100644 index 00000000000..737e278f1ab --- /dev/null +++ b/src/azure-cli-testsdk/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["setuptools>=64", "wheel"] +build-backend = "setuptools.build_meta" \ No newline at end of file diff --git a/src/azure-cli/pyproject.toml b/src/azure-cli/pyproject.toml new file mode 100644 index 00000000000..737e278f1ab --- /dev/null +++ b/src/azure-cli/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["setuptools>=64", "wheel"] +build-backend = "setuptools.build_meta" \ No newline at end of file diff --git a/tools/pyproject.toml b/tools/pyproject.toml new file mode 100644 index 00000000000..737e278f1ab --- /dev/null +++ b/tools/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["setuptools>=64", "wheel"] +build-backend = "setuptools.build_meta" \ No newline at end of file From 5013fd302395ec93a03b038d8369fcd5ca00f439 Mon Sep 17 00:00:00 2001 From: ZelinWang Date: Mon, 27 Oct 2025 10:36:38 +0800 Subject: [PATCH 2/6] minor fix --- src/azure-cli-core/pyproject.toml | 2 +- src/azure-cli-telemetry/pyproject.toml | 2 +- src/azure-cli-testsdk/pyproject.toml | 2 +- src/azure-cli/pyproject.toml | 2 +- src/azure-cli/setup.cfg | 2 -- src/azure-cli/setup.py | 1 + tools/pyproject.toml | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/azure-cli-core/pyproject.toml b/src/azure-cli-core/pyproject.toml index 737e278f1ab..7307b1be287 100644 --- a/src/azure-cli-core/pyproject.toml +++ b/src/azure-cli-core/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["setuptools>=64", "wheel"] +requires = ["setuptools>=64", "wheel", "pkginfo"] build-backend = "setuptools.build_meta" \ No newline at end of file diff --git a/src/azure-cli-telemetry/pyproject.toml b/src/azure-cli-telemetry/pyproject.toml index 737e278f1ab..7307b1be287 100644 --- a/src/azure-cli-telemetry/pyproject.toml +++ b/src/azure-cli-telemetry/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["setuptools>=64", "wheel"] +requires = ["setuptools>=64", "wheel", "pkginfo"] build-backend = "setuptools.build_meta" \ No newline at end of file diff --git a/src/azure-cli-testsdk/pyproject.toml b/src/azure-cli-testsdk/pyproject.toml index 737e278f1ab..7307b1be287 100644 --- a/src/azure-cli-testsdk/pyproject.toml +++ b/src/azure-cli-testsdk/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["setuptools>=64", "wheel"] +requires = ["setuptools>=64", "wheel", "pkginfo"] build-backend = "setuptools.build_meta" \ No newline at end of file diff --git a/src/azure-cli/pyproject.toml b/src/azure-cli/pyproject.toml index 737e278f1ab..7307b1be287 100644 --- a/src/azure-cli/pyproject.toml +++ b/src/azure-cli/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["setuptools>=64", "wheel"] +requires = ["setuptools>=64", "wheel", "pkginfo"] build-backend = "setuptools.build_meta" \ No newline at end of file diff --git a/src/azure-cli/setup.cfg b/src/azure-cli/setup.cfg index d1880740e37..e69de29bb2d 100644 --- a/src/azure-cli/setup.cfg +++ b/src/azure-cli/setup.cfg @@ -1,2 +0,0 @@ -[build_py] -extra_build_source_files=azure.cli,__main__,azure/cli/__main__.py diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index 48eaf988988..f398cb37be9 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -182,6 +182,7 @@ install_requires=DEPENDENCIES, python_requires='>=3.9.0', package_data={ + 'azure.cli': ['__main__.py'], 'azure.cli.command_modules.acr': ['*.json'], 'azure.cli.command_modules.botservice': ['*.json', '*.config'], 'azure.cli.command_modules.monitor.operations': ['autoscale-parameters-template.json'], diff --git a/tools/pyproject.toml b/tools/pyproject.toml index 737e278f1ab..7307b1be287 100644 --- a/tools/pyproject.toml +++ b/tools/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["setuptools>=64", "wheel"] +requires = ["setuptools>=64", "wheel", "pkginfo"] build-backend = "setuptools.build_meta" \ No newline at end of file From 6b2a6fea463c2efeaa76044a32f513303c4c9d61 Mon Sep 17 00:00:00 2001 From: ZelinWang Date: Mon, 27 Oct 2025 10:42:55 +0800 Subject: [PATCH 3/6] minor fix --- src/azure-cli/setup.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/azure-cli/setup.cfg b/src/azure-cli/setup.cfg index e69de29bb2d..c8bbde9675d 100644 --- a/src/azure-cli/setup.cfg +++ b/src/azure-cli/setup.cfg @@ -0,0 +1,2 @@ +[build_py] +extra_build_source_files=azure.cli,__main__,azure/cli/__main__.py \ No newline at end of file From ad09492db0363d14e3a0c3ff36b95ac2cd96f64a Mon Sep 17 00:00:00 2001 From: ZelinWang Date: Mon, 27 Oct 2025 10:51:08 +0800 Subject: [PATCH 4/6] minor fix --- .github/actions/env-setup/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/env-setup/action.yml b/.github/actions/env-setup/action.yml index 19d40dd7084..99a786612b6 100644 --- a/.github/actions/env-setup/action.yml +++ b/.github/actions/env-setup/action.yml @@ -29,7 +29,7 @@ runs: python -m venv env chmod +x env/bin/activate source ./env/bin/activate - pip install azdev + pip install azdev pkginfo azdev --version cd ../ azdev setup -c azure-cli --debug From ca9210fd8fc4db7310769d60b7ca48a50ad56fd7 Mon Sep 17 00:00:00 2001 From: ZelinWang Date: Mon, 3 Nov 2025 15:10:14 +0800 Subject: [PATCH 5/6] minor fix --- src/azure-cli/setup.cfg | 2 -- tools/pyproject.toml | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/azure-cli/setup.cfg b/src/azure-cli/setup.cfg index c8bbde9675d..e69de29bb2d 100644 --- a/src/azure-cli/setup.cfg +++ b/src/azure-cli/setup.cfg @@ -1,2 +0,0 @@ -[build_py] -extra_build_source_files=azure.cli,__main__,azure/cli/__main__.py \ No newline at end of file diff --git a/tools/pyproject.toml b/tools/pyproject.toml index 7307b1be287..eee01612688 100644 --- a/tools/pyproject.toml +++ b/tools/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["setuptools>=64", "wheel", "pkginfo"] -build-backend = "setuptools.build_meta" \ No newline at end of file +requires = ["setuptools == 70.0.0", "wheel == 0.30.0"] +build-backend = "setuptools.build_meta" From 0b7612dfa7d30573423d703506229f3c5afe9ac7 Mon Sep 17 00:00:00 2001 From: ZelinWang Date: Mon, 3 Nov 2025 15:12:00 +0800 Subject: [PATCH 6/6] minor fix --- src/azure-cli-core/pyproject.toml | 4 ++-- src/azure-cli-telemetry/pyproject.toml | 4 ++-- src/azure-cli-testsdk/pyproject.toml | 4 ++-- src/azure-cli/pyproject.toml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/azure-cli-core/pyproject.toml b/src/azure-cli-core/pyproject.toml index 7307b1be287..eee01612688 100644 --- a/src/azure-cli-core/pyproject.toml +++ b/src/azure-cli-core/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["setuptools>=64", "wheel", "pkginfo"] -build-backend = "setuptools.build_meta" \ No newline at end of file +requires = ["setuptools == 70.0.0", "wheel == 0.30.0"] +build-backend = "setuptools.build_meta" diff --git a/src/azure-cli-telemetry/pyproject.toml b/src/azure-cli-telemetry/pyproject.toml index 7307b1be287..eee01612688 100644 --- a/src/azure-cli-telemetry/pyproject.toml +++ b/src/azure-cli-telemetry/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["setuptools>=64", "wheel", "pkginfo"] -build-backend = "setuptools.build_meta" \ No newline at end of file +requires = ["setuptools == 70.0.0", "wheel == 0.30.0"] +build-backend = "setuptools.build_meta" diff --git a/src/azure-cli-testsdk/pyproject.toml b/src/azure-cli-testsdk/pyproject.toml index 7307b1be287..eee01612688 100644 --- a/src/azure-cli-testsdk/pyproject.toml +++ b/src/azure-cli-testsdk/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["setuptools>=64", "wheel", "pkginfo"] -build-backend = "setuptools.build_meta" \ No newline at end of file +requires = ["setuptools == 70.0.0", "wheel == 0.30.0"] +build-backend = "setuptools.build_meta" diff --git a/src/azure-cli/pyproject.toml b/src/azure-cli/pyproject.toml index 7307b1be287..eee01612688 100644 --- a/src/azure-cli/pyproject.toml +++ b/src/azure-cli/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["setuptools>=64", "wheel", "pkginfo"] -build-backend = "setuptools.build_meta" \ No newline at end of file +requires = ["setuptools == 70.0.0", "wheel == 0.30.0"] +build-backend = "setuptools.build_meta"