Merge branch 'main' into copilot/fix-42506

Author: bambriz

eng/pipelines/templates/stages/archetype-python-release.yml

@@ -185,8 +185,8 @@ stages:
                           echo "Uploaded sdist to devops feed"
                         displayName: 'Publish package to feed: ${{parameters.DevFeedName}}'
 
-          - job: CreateApiView
-            displayName: "Create APIView"
+          - job: MarkPackageReleaseCompletion
+            displayName: "Mark package release completion"
             dependsOn: PublishPackage
 
             pool:
@@ -205,6 +205,11 @@ stages:
                 inputs:
                   versionSpec: '3.9'
 
+              - template: /eng/common/pipelines/templates/steps/mark-release-completion.yml
+                parameters:
+                  ConfigFileDir: '$(Pipeline.Workspace)/${{parameters.ArtifactName}}/PackageInfo'
+                  PackageArtifactName: ${{artifact.name}}
+
               - template: /eng/common/pipelines/templates/steps/create-apireview.yml
                 parameters:
                   ArtifactPath: $(Pipeline.Workspace)/${{parameters.ArtifactName}}

eng/tools/azure-sdk-tools/tests/README.md …tion/scenarios/snippet-updater/README.mdeng/tools/azure-sdk-tools/tests/README.md renamed to eng/tools/azure-sdk-tools/tests/integration/scenarios/snippet-updater/README.md eng/tools/azure-sdk-tools/tests/README.md renamed to eng/tools/azure-sdk-tools/tests/integration/scenarios/snippet-updater/README.md

@@ -4,7 +4,7 @@
 from ci_tools.functions import discover_targeted_packages
 
 
-repo_root = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "..", ".."))
+repo_root = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "..", "..", ".."))
 core_service_root = os.path.join(repo_root, "sdk", "core")
 storage_service_root = os.path.join(repo_root, "sdk", "storage")
 

…dk-tools/tests/README_missing_snippet.md …nippet-updater/README_missing_snippet.mdeng/tools/azure-sdk-tools/tests/README_missing_snippet.md renamed to eng/tools/azure-sdk-tools/tests/integration/scenarios/snippet-updater/README_missing_snippet.md eng/tools/azure-sdk-tools/tests/README_missing_snippet.md renamed to eng/tools/azure-sdk-tools/tests/integration/scenarios/snippet-updater/README_missing_snippet.md

@@ -1,15 +1,32 @@
 import os
 import pytest
+import shutil
+from tempfile import mkdtemp
+
 from ci_tools.snippet_update.python_snippet_updater import (
     get_snippet,
     update_snippet,
     check_snippets,
     check_not_up_to_date,
 )
 
+scenario = os.path.join(os.path.dirname(__file__), "integration", "scenarios", "snippet-updater")
+
+def create_temp_directory_from_template(input_directory: str) -> str:
+    """
+    Create a temporary directory from a template directory.
+    Args:
+        input_directory (str): The path to the input directory to copy.
+    Returns:
+        str: The path to the newly created temporary directory.
+    """
+    temp_dir = mkdtemp()
+    shutil.copytree(input_directory, temp_dir, dirs_exist_ok=True)
+    return temp_dir
+
 
 def test_get_snippet():
-    folder = os.path.dirname(os.path.abspath(__file__))
+    folder = scenario
     file = os.path.join(folder, "example_async.py")
     get_snippet(file)
     snippets = check_snippets().keys()
@@ -19,15 +36,15 @@ def test_get_snippet():
 
 
 def test_update_snippet():
-    folder = os.path.dirname(os.path.abspath(__file__))
+    folder = create_temp_directory_from_template(scenario)
     file = os.path.join(folder, "example_async.py")
     get_snippet(file)
     file_1 = os.path.join(folder, "README.md")
     update_snippet(file_1)
 
 
 def test_missing_snippet():
-    folder = os.path.dirname(os.path.abspath(__file__))
+    folder = create_temp_directory_from_template(scenario)
     file = os.path.join(folder, "example_async.py")
     get_snippet(file)
     file_1 = os.path.join(folder, "README_missing_snippet.md")
@@ -36,7 +53,7 @@ def test_missing_snippet():
 
 
 def test_out_of_sync():
-    folder = os.path.dirname(os.path.abspath(__file__))
+    folder = create_temp_directory_from_template(scenario)
     file = os.path.join(folder, "example_async.py")
     get_snippet(file)
     file_1 = os.path.join(folder, "README_out_of_sync.md")

…re-sdk-tools/tests/README_out_of_sync.md …os/snippet-updater/README_out_of_sync.mdeng/tools/azure-sdk-tools/tests/README_out_of_sync.md renamed to eng/tools/azure-sdk-tools/tests/integration/scenarios/snippet-updater/README_out_of_sync.md eng/tools/azure-sdk-tools/tests/README_out_of_sync.md renamed to eng/tools/azure-sdk-tools/tests/integration/scenarios/snippet-updater/README_out_of_sync.md

@@ -67,7 +67,7 @@ def test_replace_dev_reqs_relative(tmp_directory_create):
     ).version
     identity_version = ParsedSetup.from_path(os.path.join(repo_root, "sdk", "identity", "azure-identity")).version
     mgmt_core_version = ParsedSetup.from_path(os.path.join(repo_root, "sdk", "core", "azure-mgmt-core")).version
-    sdk_tools_version = ParsedSetup.from_path(os.path.join(repo_root, "tools", "azure-sdk-tools")).version
+    sdk_tools_version = ParsedSetup.from_path(os.path.join(repo_root, "eng", "tools", "azure-sdk-tools")).version
     core_version = ParsedSetup.from_path(os.path.join(repo_root, "sdk", "core", "azure-core")).version
     keyvault_version = ParsedSetup.from_path(os.path.join(repo_root, "sdk", "keyvault", "azure-keyvault-keys")).version
 

…s/azure-sdk-tools/tests/example_async.py …enarios/snippet-updater/example_async.pyeng/tools/azure-sdk-tools/tests/example_async.py renamed to eng/tools/azure-sdk-tools/tests/integration/scenarios/snippet-updater/example_async.py eng/tools/azure-sdk-tools/tests/example_async.py renamed to eng/tools/azure-sdk-tools/tests/integration/scenarios/snippet-updater/example_async.py

@@ -75,7 +75,7 @@ def select_install_type(pkg, run_develop, exceptions):
 
 packages = {
     tuple(os.path.dirname(f).rsplit(os.sep, 1))
-    for f in glob.glob(os.path.join(root_dir, "sdk/*/azure-*/setup.py")) + glob.glob(os.path.join(root_dir, "tools/azure-*/setup.py"))
+    for f in glob.glob(os.path.join(root_dir, "sdk/*/azure-*/setup.py")) + glob.glob(os.path.join(root_dir, "eng/tools/azure-*/setup.py"))
 }
 # [(base_folder, package_name), ...] to {package_name: base_folder, ...}
 packages = {package_name: base_folder for (base_folder, package_name) in packages}

eng/tools/azure-sdk-tools/tests/integration/test_package_discovery.py

@@ -25,7 +25,7 @@
     args = parser.parse_args()
 
     package_name = args.package_name.replace("_", "-")
-    path_to_setup = os.path.join(root_dir, "sdk", args.service, package_name, "setup.py")
+    path_to_setup = os.path.join(root_dir, "sdk", args.service, package_name)
 
     missing_packages = find_packages_missing_on_pypi(path_to_setup)