Fix VerifySdist failure (Azure#42550)

scbedd · Copilot · web-flow · commit d0d6eb93d898 · 2025-08-15T15:33:59.000-07:00
* add tests for set_dev_version
* fix issue with classification not updating.

Co-authored-by: Copilot &lt;175728472+Copilot@users.noreply.github.com&gt;
diff --git a/.github/workflows/azure-sdk-tools.yml b/.github/workflows/azure-sdk-tools.yml
@@ -13,10 +13,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up Python 3.11
+      - name: Set up Python 3.13
         uses: actions/setup-python@v4
         with:
-          python-version: 3.11
+          python-version: 3.13
 
       - name: Install azure-sdk-tools
         run: |
diff --git a/tools/azure-sdk-tools/ci_tools/versioning/version_set_dev.py b/tools/azure-sdk-tools/ci_tools/versioning/version_set_dev.py
@@ -20,6 +20,9 @@
 
 from ci_tools.variables import discover_repo_root
 from ci_tools.functions import process_requires
+from ci_tools.parsing import ParsedSetup
+
+from typing import List
 
 MAX_R_DIGITS = 3
 
@@ -84,6 +87,9 @@ def version_set_dev_main() -> None:
     target_packages = get_packages(args, root_dir=root_dir)
     build_id = format_build_id(args.build_id)
 
+    set_dev_version(target_packages, build_id)
+
+def set_dev_version(target_packages: List[ParsedSetup], build_id: str):
     if not target_packages:
         print("No packages found")
 
diff --git a/tools/azure-sdk-tools/ci_tools/versioning/version_shared.py b/tools/azure-sdk-tools/ci_tools/versioning/version_shared.py
@@ -26,7 +26,7 @@
 
 VERSION_STRING = 'VERSION = "%s"'
 
-DEV_STATUS_REGEX = r'(classifiers=\[(\s)*)(["\']Development Status :: .*["\'])'
+DEV_STATUS_REGEX = r'(classifiers\s*=\s*\[(\s)*)(["\']Development Status :: .*["\'])'
 
 logging.getLogger().setLevel(logging.INFO)
 
diff --git a/tools/azure-sdk-tools/tests/integration/scenarios/pyproject_project_def/pyproject.toml b/tools/azure-sdk-tools/tests/integration/scenarios/pyproject_project_def/pyproject.toml
@@ -8,7 +8,7 @@ authors = [
     {name = "Microsoft Corporation", email = "azurekeyvault@microsoft.com"}
     ]
 description = "Microsoft Azure Key Vault Keys Client Library for Python"
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 license = {text = "MIT License"}
 classifiers = [
     "Development Status :: 5 - Production/Stable",
diff --git a/tools/azure-sdk-tools/tests/integration/scenarios/pyproject_project_def_beta/README.md b/tools/azure-sdk-tools/tests/integration/scenarios/pyproject_project_def_beta/README.md
@@ -0,0 +1 @@
+This is an example of a package with all its metadata defined within the `[project]` setting of a `pyproject.toml`. This `pyproject.toml` file will not work with an actual build (none of the files/folders are present).
diff --git a/tools/azure-sdk-tools/tests/integration/scenarios/pyproject_project_def_beta/azure/__init__.py b/tools/azure-sdk-tools/tests/integration/scenarios/pyproject_project_def_beta/azure/__init__.py
@@ -0,0 +1,6 @@
+# ------------------------------------
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+# ------------------------------------
+# pylint:disable=missing-docstring
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)  # type: ignore
diff --git a/tools/azure-sdk-tools/tests/integration/scenarios/pyproject_project_def_beta/azure/keyvault/__init__.py b/tools/azure-sdk-tools/tests/integration/scenarios/pyproject_project_def_beta/azure/keyvault/__init__.py
@@ -0,0 +1,6 @@
+# ------------------------------------
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+# ------------------------------------
+# pylint:disable=missing-docstring
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)  # type: ignore
diff --git a/tools/azure-sdk-tools/tests/integration/scenarios/pyproject_project_def_beta/azure/keyvault/keys/__init__.py b/tools/azure-sdk-tools/tests/integration/scenarios/pyproject_project_def_beta/azure/keyvault/keys/__init__.py
@@ -0,0 +1,8 @@
+# ------------------------------------
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+# -------------------------------------
+
+from ._version import VERSION
+
+__version__ = VERSION
diff --git a/tools/azure-sdk-tools/tests/integration/scenarios/pyproject_project_def_beta/azure/keyvault/keys/_version.py b/tools/azure-sdk-tools/tests/integration/scenarios/pyproject_project_def_beta/azure/keyvault/keys/_version.py
@@ -0,0 +1,6 @@
+# ------------------------------------
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+# ------------------------------------
+
+VERSION = "0.0.1b1"
diff --git a/tools/azure-sdk-tools/tests/integration/scenarios/pyproject_project_def_beta/azure/keyvault/keys/py.typed b/tools/azure-sdk-tools/tests/integration/scenarios/pyproject_project_def_beta/azure/keyvault/keys/py.typed
diff --git a/tools/azure-sdk-tools/tests/integration/scenarios/pyproject_project_def_beta/pyproject.toml b/tools/azure-sdk-tools/tests/integration/scenarios/pyproject_project_def_beta/pyproject.toml
@@ -0,0 +1,49 @@
+[build-system]
+requires = ["setuptools>=61.0.0", "wheel"]  # Requires 61.0.0 for dynamic version
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "azure-keyvault-keys"
+authors = [
+    {name = "Microsoft Corporation", email = "azurekeyvault@microsoft.com"}
+    ]
+description = "Microsoft Azure Key Vault Keys Client Library for Python"
+requires-python = ">=3.8"
+license = {text = "MIT License"}
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "License :: OSI Approved :: MIT License"
+    ]
+dependencies = [
+    "azure-common~=1.1",
+    "azure-core<2.0.0,>=1.24.0",
+    "cryptography>=2.1.4",
+    "isodate>=0.6.1",
+    "typing-extensions>=4.0.1"
+    ]
+dynamic = ["version"]
+readme = "README.md"
+
+[project.urls]
+repository = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-keys"
+
+[tool.setuptools.dynamic]
+version = {attr = "azure.keyvault.keys.__version__"}
+
+[tool.setuptools.package-data]
+"py.typed" = ["py.typed"]
+
+[tool.setuptools.packages.find]
+exclude = ["samples", "tests", "azure", "azure.keyvault"]
+
+[tool.azure-sdk-build]
+pyright = false
+type_check_samples = false
diff --git a/tools/azure-sdk-tools/tests/integration/scenarios/setup_py_metapackage/setup.py b/tools/azure-sdk-tools/tests/integration/scenarios/setup_py_metapackage/setup.py
@@ -1,39 +1,40 @@
 #!/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.
-#--------------------------------------------------------------------------
+# --------------------------------------------------------------------------
 
 from setuptools import setup
 from io import open
+
 setup(
-    name='azure-keyvault',
-    version='4.2.1b1',
-    description='Microsoft Azure Key Vault Client Libraries for Python',
+    name="azure-keyvault",
+    version="4.2.1b1",
+    description="Microsoft Azure Key Vault Client Libraries for Python",
     long_description_content_type="text/markdown",
-    license='MIT License',
-    author='Microsoft Corporation',
+    license="MIT License",
+    author="Microsoft Corporation",
     author_email="azurekeyvault@microsoft.com",
     url="https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault",
     keywords="azure, azure sdk",
     classifiers=[
         "Development Status :: 5 - Production/Stable",
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 3 :: Only',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.10',
-        'Programming Language :: Python :: 3.11',
-        'Programming Language :: Python :: 3.12',
-        'License :: OSI Approved :: MIT License',
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3 :: Only",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
+        "License :: OSI Approved :: MIT License",
     ],
     zip_safe=False,
     install_requires=[
-        'azure-keyvault-certificates~=4.4',
-        'azure-keyvault-secrets~=4.4',
-        'azure-keyvault-keys~=4.5',
+        "azure-keyvault-certificates~=4.4",
+        "azure-keyvault-secrets~=4.4",
+        "azure-keyvault-keys~=4.5",
     ],
 )
diff --git a/tools/azure-sdk-tools/tests/integration/scenarios/setup_py_project_def/azure/core/__init__.py b/tools/azure-sdk-tools/tests/integration/scenarios/setup_py_project_def/azure/core/__init__.py
@@ -0,0 +1,29 @@
+# --------------------------------------------------------------------------
+#
+# Copyright (c) Microsoft Corporation. All rights reserved.
+#
+# The MIT License (MIT)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the ""Software""), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+#
+# --------------------------------------------------------------------------
+
+from ._version import VERSION
+
+__version__ = VERSION
diff --git a/tools/azure-sdk-tools/tests/integration/scenarios/setup_py_project_def/azure/core/_version.py b/tools/azure-sdk-tools/tests/integration/scenarios/setup_py_project_def/azure/core/_version.py
@@ -0,0 +1,12 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+VERSION = "1.0.0"
diff --git a/tools/azure-sdk-tools/tests/integration/scenarios/setup_py_project_def/setup.py b/tools/azure-sdk-tools/tests/integration/scenarios/setup_py_project_def/setup.py
@@ -29,15 +29,12 @@
 
 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=readme,
     long_description_content_type="text/markdown",
     license="MIT License",
     author="Microsoft Corporation",
diff --git a/tools/azure-sdk-tools/tests/test_build_interactions.py b/tools/azure-sdk-tools/tests/test_build_interactions.py
@@ -7,11 +7,14 @@
 pyproject_folder = os.path.join(integration_folder, "scenarios", "pyproject_build_config")
 pyproject_file = os.path.join(integration_folder, "scenarios", "pyproject_build_config", "pyproject.toml")
 
+
 def test_build_core():
     pass
 
+
 def test_discover_targeted_packages():
     pass
 
+
 def test_build_packages():
-    pass
+    pass
diff --git a/tools/azure-sdk-tools/tests/test_ci_metadata.py b/tools/azure-sdk-tools/tests/test_ci_metadata.py
@@ -9,6 +9,7 @@
 scenario_present = os.path.join(integration_folder, "scenarios", "ci_yml_present", "service", "fake-package")
 scenario_not_present = os.path.join(integration_folder, "scenarios", "ci_yml_not_present", "service", "fake-package")
 
+
 def test_ci_config_present():
     config = get_ci_config(scenario_present)
     assert config is not None
@@ -18,6 +19,7 @@ def test_ci_config_present():
     should_proxy = config.get("extends", {}).get("parameters", {}).get("TestProxy", True)
     assert should_proxy == False
 
+
 def test_ci_config_non_present():
     config = get_ci_config(scenario_not_present)
-    assert config is None
+    assert config is None
diff --git a/tools/azure-sdk-tools/tests/test_conda_configuration.py b/tools/azure-sdk-tools/tests/test_conda_configuration.py
@@ -4,6 +4,7 @@
 
 from ci_tools.conda.CondaConfiguration import CondaConfiguration
 
+
 def test_conda_config_retrieve():
     raw_json = """
     {
@@ -29,4 +30,3 @@ def test_conda_config_retrieve():
     """
 
     CondaConfiguration.from_json(json.loads(raw_json))
-
diff --git a/tools/azure-sdk-tools/tests/test_conflict_resolution.py b/tools/azure-sdk-tools/tests/test_conflict_resolution.py
@@ -10,8 +10,10 @@
 
 @pytest.mark.parametrize(
     "fake_package_input_requirements, immutable_requirements, expected_result",
-    [([Requirement("sphinx==1.0.0")], [Requirement("sphinx>=1.0.0")], True),
-     ([Requirement("sphinx==1.0.0")], [Requirement("sphinx>=1.1.0")], False)],
+    [
+        ([Requirement("sphinx==1.0.0")], [Requirement("sphinx>=1.0.0")], True),
+        ([Requirement("sphinx==1.0.0")], [Requirement("sphinx>=1.1.0")], False),
+    ],
 )
 def test_incompatible_specifier(fake_package_input_requirements, immutable_requirements, expected_result):
     result = is_package_compatible("fake-package", fake_package_input_requirements, immutable_requirements)
diff --git a/tools/azure-sdk-tools/tests/test_parse_functionality.py b/tools/azure-sdk-tools/tests/test_parse_functionality.py
@@ -232,7 +232,7 @@ def test_parse_pyproject():
         "isodate>=0.6.1",
         "typing-extensions>=4.0.1",
     ]
-    assert parsed_project.python_requires == ">=3.7"
+    assert parsed_project.python_requires == ">=3.8"
     assert parsed_project.is_new_sdk == True
     assert parsed_project.is_pyproject == True
     assert parsed_project.package_data == {"py.typed": ["py.typed"]}
@@ -274,11 +274,11 @@ def test_namespace_discovery_eventhub_checkpointstoreblob():
     eventhub_path = os.path.join(
         os.path.dirname(__file__), "..", "..", "..", "sdk", "eventhub", "azure-eventhub-checkpointstoreblob"
     )
-    
+
     # Check if the path exists (it should in the Azure SDK repo)
     if os.path.exists(eventhub_path):
         parsed_project = ParsedSetup.from_path(eventhub_path)
-        
+
         assert parsed_project.name == "azure-eventhub-checkpointstoreblob"
         assert parsed_project.namespace == "azure.eventhub.extensions.checkpointstoreblob"
     else:
@@ -289,7 +289,7 @@ def test_namespace_discovery_fallback():
     """Test that namespace discovery falls back to simple replacement when no packages found"""
     # This tests the fallback behavior when no actual package structure is found
     from ci_tools.parsing.parse_functions import discover_namespace
-    
+
     # Test with non-existent path
     result = discover_namespace("/non/existent/path")
     assert result is None
@@ -300,13 +300,13 @@ def test_namespace_discovery_with_extension_only():
     from ci_tools.parsing.parse_functions import _set_root_namespace
     import tempfile
     import os
-    
+
     # Create a temporary __init__.py file with only extension content
-    with tempfile.NamedTemporaryFile(mode='w', suffix='__init__.py', delete=False) as f:
-        f.write('# comment\n')
+    with tempfile.NamedTemporaryFile(mode="w", suffix="__init__.py", delete=False) as f:
+        f.write("# comment\n")
         f.write('__path__ = __import__("pkgutil").extend_path(__path__, __name__)\n')
         temp_file = f.name
-    
+
     try:
         result = _set_root_namespace(temp_file, "test.module")
         # Should return None because it only contains extension logic
@@ -320,14 +320,14 @@ def test_namespace_discovery_with_substantial_content():
     from ci_tools.parsing.parse_functions import _set_root_namespace
     import tempfile
     import os
-    
+
     # Create a temporary __init__.py file with substantial content
-    with tempfile.NamedTemporaryFile(mode='w', suffix='__init__.py', delete=False) as f:
-        f.write('# comment\n')
-        f.write('from ._version import VERSION\n')
-        f.write('__version__ = VERSION\n')
+    with tempfile.NamedTemporaryFile(mode="w", suffix="__init__.py", delete=False) as f:
+        f.write("# comment\n")
+        f.write("from ._version import VERSION\n")
+        f.write("__version__ = VERSION\n")
         temp_file = f.name
-    
+
     try:
         result = _set_root_namespace(temp_file, "test.module")
         # Should return the module name because it contains substantial content
diff --git a/tools/azure-sdk-tools/tests/test_versioning.py b/tools/azure-sdk-tools/tests/test_versioning.py

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ authors = [`
`8`	`8`	`{name = "Microsoft Corporation", email = "[email protected]"}`
`9`	`9`	`]`
`10`	`10`	`description = "Microsoft Azure Key Vault Keys Client Library for Python"`
`11`		`-requires-python = ">=3.7"`
	`11`	`+requires-python = ">=3.8"`
`12`	`12`	`license = {text = "MIT License"}`
`13`	`13`	`classifiers = [`
`14`	`14`	`"Development Status :: 5 - Production/Stable",`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+This is an example of a package with all its metadata defined within the `[project]` setting of a `pyproject.toml`. This `pyproject.toml` file will not work with an actual build (none of the files/folders are present).