From 799fda179283acd96e9adae8c1fb77d7d50a7be8 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 7 Aug 2025 16:36:28 +0000 Subject: [PATCH 1/4] Initial plan From 6adaf11ea1292cf66904799aab0cd374c58334e0 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 7 Aug 2025 16:44:50 +0000 Subject: [PATCH 2/4] Convert azure-identity packages from setup.py to pyproject.toml Co-authored-by: swathipil <76007337+swathipil@users.noreply.github.com> --- .../azure-identity-broker/pyproject.toml | 43 ++++++++++++ sdk/identity/azure-identity-broker/setup.py | 68 ------------------- sdk/identity/azure-identity/pyproject.toml | 46 +++++++++++++ sdk/identity/azure-identity/setup.py | 68 ------------------- 4 files changed, 89 insertions(+), 136 deletions(-) delete mode 100644 sdk/identity/azure-identity-broker/setup.py delete mode 100644 sdk/identity/azure-identity/setup.py diff --git a/sdk/identity/azure-identity-broker/pyproject.toml b/sdk/identity/azure-identity-broker/pyproject.toml index 2a4cdda7a635..6f2ef81969a3 100644 --- a/sdk/identity/azure-identity-broker/pyproject.toml +++ b/sdk/identity/azure-identity-broker/pyproject.toml @@ -1,3 +1,46 @@ +[build-system] +requires = ["setuptools>=77.0.3", "wheel"] +build-backend = "setuptools.build_meta" + +[project] +name = "azure-identity-broker" +authors = [ + {name = "Microsoft Corporation", email = "azpysdkhelp@microsoft.com"}, +] +description = "Microsoft Azure Identity Broker plugin for Python" +keywords = ["azure", "azure sdk"] +requires-python = ">=3.9" +license = "MIT" +classifiers = [ + "Development Status :: 4 - Beta", + "Programming Language :: Python", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", +] +dependencies = [ + "azure-identity<2.0.0,>=1.18.0", + "msal[broker]>=1.33.0b1,<2", +] +dynamic = ["version", "readme"] + +[project.urls] +repository = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity-broker" + +[tool.setuptools.dynamic] +version = {attr = "azure.identity.broker._version.VERSION"} +readme = {file = ["README.md", "CHANGELOG.md"], content-type = "text/markdown"} + +[tool.setuptools.packages.find] +include = ["azure.identity.broker"] + +[tool.setuptools.package-data] +pytyped = ["py.typed"] + [tool.azure-sdk-build] pyright = false black = true diff --git a/sdk/identity/azure-identity-broker/setup.py b/sdk/identity/azure-identity-broker/setup.py deleted file mode 100644 index e1dcdbafaa63..000000000000 --- a/sdk/identity/azure-identity-broker/setup.py +++ /dev/null @@ -1,68 +0,0 @@ -#!/usr/bin/env python - -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- - -import re -import os.path -from io import open -from setuptools import find_packages, setup # type: ignore - -# Change the PACKAGE_NAME only to change folder and different name -PACKAGE_NAME = "azure-identity-broker" -PACKAGE_PPRINT_NAME = "Identity Broker plugin" - -package_folder_path = "azure/identity/broker" - -# Version extraction inspired from 'requests' -with open(os.path.join(package_folder_path, "_version.py"), "r") as fd: - version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1) # type: ignore - -if not version: - raise RuntimeError("Cannot find version information") - -with open("README.md", encoding="utf-8") as f: - readme = f.read() -with open("CHANGELOG.md", encoding="utf-8") as f: - changelog = f.read() - -setup( - name=PACKAGE_NAME, - version=version, - description="Microsoft Azure {} for Python".format(PACKAGE_PPRINT_NAME), - long_description=readme + "\n\n" + changelog, - long_description_content_type="text/markdown", - license="MIT License", - author="Microsoft Corporation", - author_email="azpysdkhelp@microsoft.com", - url="https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity-broker", - keywords="azure, azure sdk", - classifiers=[ - "Development Status :: 4 - Beta", - "Programming Language :: Python", - "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", - "Programming Language :: Python :: 3.13", - "License :: OSI Approved :: MIT License", - ], - zip_safe=False, - packages=[ - "azure.identity.broker", - ], - include_package_data=True, - package_data={ - "pytyped": ["py.typed"], - }, - python_requires=">=3.9", - install_requires=[ - "azure-identity<2.0.0,>=1.18.0", - "msal[broker]>=1.33.0b1,<2", - ], -) diff --git a/sdk/identity/azure-identity/pyproject.toml b/sdk/identity/azure-identity/pyproject.toml index 25468ed89081..7611689b24ea 100644 --- a/sdk/identity/azure-identity/pyproject.toml +++ b/sdk/identity/azure-identity/pyproject.toml @@ -1,3 +1,49 @@ +[build-system] +requires = ["setuptools>=77.0.3", "wheel"] +build-backend = "setuptools.build_meta" + +[project] +name = "azure-identity" +authors = [ + {name = "Microsoft Corporation", email = "azpysdkhelp@microsoft.com"}, +] +description = "Microsoft Azure Identity Library for Python" +keywords = ["azure", "azure sdk"] +requires-python = ">=3.9" +license = "MIT" +classifiers = [ + "Development Status :: 4 - Beta", + "Programming Language :: Python", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", +] +dependencies = [ + "azure-core>=1.31.0", + "cryptography>=2.5", + "msal>=1.30.0", + "msal-extensions>=1.2.0", + "typing-extensions>=4.0.0", +] +dynamic = ["version", "readme"] + +[project.urls] +repository = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity" + +[tool.setuptools.dynamic] +version = {attr = "azure.identity._version.VERSION"} +readme = {file = ["README.md", "CHANGELOG.md"], content-type = "text/markdown"} + +[tool.setuptools.packages.find] +exclude = ["tests*", "azure"] + +[tool.setuptools.package-data] +pytyped = ["py.typed"] + [tool.azure-sdk-build] pyright = false verifytypes = true diff --git a/sdk/identity/azure-identity/setup.py b/sdk/identity/azure-identity/setup.py deleted file mode 100644 index 1fbbd5a55de8..000000000000 --- a/sdk/identity/azure-identity/setup.py +++ /dev/null @@ -1,68 +0,0 @@ -#!/usr/bin/env python - -# ------------------------------------ -# Copyright (c) Microsoft Corporation. -# Licensed under the MIT License. -# ------------------------------------ -import re -import os.path -from io import open -from setuptools import find_packages, setup - -PACKAGE_NAME = "azure-identity" -PACKAGE_PPRINT_NAME = "Identity" - -package_folder_path = PACKAGE_NAME.replace("-", "/") -namespace_name = PACKAGE_NAME.replace("-", ".") - -with open(os.path.join(package_folder_path, "_version.py"), "r") as fd: - VERSION = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1) # type: ignore -if not VERSION: - raise RuntimeError("Cannot find version information") - -with open("README.md", encoding="utf-8") as f: - README = f.read() -with open("CHANGELOG.md", encoding="utf-8") as f: - CHANGELOG = f.read() - -setup( - name=PACKAGE_NAME, - version=VERSION, - include_package_data=True, - description="Microsoft Azure {} Library for Python".format(PACKAGE_PPRINT_NAME), - long_description=README + "\n\n" + CHANGELOG, - long_description_content_type="text/markdown", - license="MIT License", - author="Microsoft Corporation", - author_email="azpysdkhelp@microsoft.com", - url="https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity", - keywords="azure, azure sdk", - classifiers=[ - "Development Status :: 4 - Beta", - "Programming Language :: Python", - "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", - "Programming Language :: Python :: 3.13", - "License :: OSI Approved :: MIT License", - ], - zip_safe=False, - packages=find_packages( - exclude=[ - "tests", - # Exclude packages that will be covered by PEP420 or nspkg - "azure", - ] - ), - python_requires=">=3.9", - install_requires=[ - "azure-core>=1.31.0", - "cryptography>=2.5", - "msal>=1.30.0", - "msal-extensions>=1.2.0", - "typing-extensions>=4.0.0", - ], -) From 68a2bba46644407b689bfb6727b4600cb8dfa65b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 13 Aug 2025 21:47:47 +0000 Subject: [PATCH 3/4] Address review feedback: update repository URLs and exclude patterns in pyproject.toml Co-authored-by: swathipil <76007337+swathipil@users.noreply.github.com> --- sdk/identity/azure-identity-broker/pyproject.toml | 2 +- sdk/identity/azure-identity/pyproject.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/identity/azure-identity-broker/pyproject.toml b/sdk/identity/azure-identity-broker/pyproject.toml index 6f2ef81969a3..50aababac0b3 100644 --- a/sdk/identity/azure-identity-broker/pyproject.toml +++ b/sdk/identity/azure-identity-broker/pyproject.toml @@ -29,7 +29,7 @@ dependencies = [ dynamic = ["version", "readme"] [project.urls] -repository = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity-broker" +repository = "https://github.com/Azure/azure-sdk-for-python" [tool.setuptools.dynamic] version = {attr = "azure.identity.broker._version.VERSION"} diff --git a/sdk/identity/azure-identity/pyproject.toml b/sdk/identity/azure-identity/pyproject.toml index 7611689b24ea..976d0106fcdf 100644 --- a/sdk/identity/azure-identity/pyproject.toml +++ b/sdk/identity/azure-identity/pyproject.toml @@ -32,14 +32,14 @@ dependencies = [ dynamic = ["version", "readme"] [project.urls] -repository = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity" +repository = "https://github.com/Azure/azure-sdk-for-python" [tool.setuptools.dynamic] version = {attr = "azure.identity._version.VERSION"} readme = {file = ["README.md", "CHANGELOG.md"], content-type = "text/markdown"} [tool.setuptools.packages.find] -exclude = ["tests*", "azure"] +exclude = ["tests*", "samples*", "azure"] [tool.setuptools.package-data] pytyped = ["py.typed"] From a22bc6700ccc99bde1d950171180711a0ae909cf Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 13 Aug 2025 22:46:46 +0000 Subject: [PATCH 4/4] Remove unnecessary license classifier from pyproject.toml files Co-authored-by: swathipil <76007337+swathipil@users.noreply.github.com> --- sdk/identity/azure-identity-broker/pyproject.toml | 1 - sdk/identity/azure-identity/pyproject.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/sdk/identity/azure-identity-broker/pyproject.toml b/sdk/identity/azure-identity-broker/pyproject.toml index ffc5d0f5d903..808055951185 100644 --- a/sdk/identity/azure-identity-broker/pyproject.toml +++ b/sdk/identity/azure-identity-broker/pyproject.toml @@ -21,7 +21,6 @@ classifiers = [ "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", - "License :: OSI Approved :: MIT License", ] dependencies = [ "azure-identity<2.0.0,>=1.18.0", diff --git a/sdk/identity/azure-identity/pyproject.toml b/sdk/identity/azure-identity/pyproject.toml index cc71dba969ef..5d61880b9f88 100644 --- a/sdk/identity/azure-identity/pyproject.toml +++ b/sdk/identity/azure-identity/pyproject.toml @@ -21,7 +21,6 @@ classifiers = [ "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", - "License :: OSI Approved :: MIT License", ] dependencies = [ "azure-core>=1.31.0",