Patch Nightly Alpha Process (#43260)

* fix functions::get_package_from_repo to properly handle pyproject.toml converted packages
* Update eng/tools/azure-sdk-tools/ci_tools/versioning/version_set_dev.py to utilize common tool code

Co-authored-by: Copilot <[email protected]>

Author: scbedd

eng/tools/azure-sdk-tools/ci_tools/functions.py

@@ -317,15 +317,17 @@ def is_required_version_on_pypi(package_name, spec):
 def get_package_from_repo(pkg_name: str, repo_root: Optional[str] = None) -> Optional[ParsedSetup]:
     root_dir = discover_repo_root(repo_root)
 
-    glob_path = os.path.join(root_dir, "sdk", "*", pkg_name, "setup.py")
-    paths = glob.glob(glob_path)
+    paths = discover_targeted_packages(pkg_name, root_dir, filter_type="Build", include_inactive=True)
 
-    if paths:
-        setup_py_path = paths[0]
-        parsed_setup = ParsedSetup.from_path(setup_py_path)
-        return parsed_setup
+    if len(paths) >= 2:
+        raise RuntimeError(
+            f"Multiple packages found for {pkg_name} within {root_dir}, please specify a more specific glob."
+        )
 
-    return None
+    if paths and len(paths) == 1:
+        return ParsedSetup.from_path(paths[0])
+
+    raise RuntimeError(f"Package {pkg_name} not found in repo {root_dir}.")
 
 
 def get_package_from_repo_or_folder(req: str, prebuilt_wheel_dir: Optional[str] = None) -> Optional[str]:
@@ -363,26 +365,21 @@ def get_version_from_repo(pkg_name: str, repo_root: Optional[str] = None) -> str
         if version_obj.pre:
             if version_obj.pre[0] == DEV_BUILD_IDENTIFIER:
                 return version_obj.base_version
-
         return str(version_obj)
     else:
-        logging.error("setup.py is not found for package {} to identify current version".format(pkg_name))
-        exit(1)
+        raise RuntimeError(f"setup.py is not found for package {pkg_name} to identify current version")
 
 
 def get_base_version(pkg_name: str) -> str:
     root_dir = discover_repo_root()
-    # find version for the package from source. This logic should be revisited to find version from devops feed
-    glob_path = os.path.join(root_dir, "sdk", "*", pkg_name, "setup.py")
-    paths = glob.glob(glob_path)
-    if paths:
-        setup_py_path = paths[0]
-        parsed_setup = ParsedSetup.from_path(setup_py_path)
+
+    parsed_setup = get_package_from_repo(pkg_name, root_dir)
+
+    if parsed_setup:
         version_obj = Version(parsed_setup.version)
         return version_obj.base_version
     else:
-        logging.error("setup.py is not found for package {} to identify current version".format(pkg_name))
-        exit(1)
+        raise RuntimeError("setup.py is not found for package {} to identify current version".format(pkg_name))
 
 
 def process_requires(setup_py_path: str, is_dev_build: bool = False):

eng/tools/azure-sdk-tools/ci_tools/versioning/version_set_dev.py

@@ -21,6 +21,7 @@
 from ci_tools.variables import discover_repo_root
 from ci_tools.functions import process_requires
 from ci_tools.parsing import ParsedSetup
+from ci_tools.logging import logger, configure_logging
 
 from typing import List
 
@@ -82,6 +83,9 @@ def version_set_dev_main() -> None:
     )
 
     args = parser.parse_args()
+
+    configure_logging(args)
+
     root_dir = args.repo or discover_repo_root()
 
     target_packages = get_packages(args, root_dir=root_dir)
@@ -102,5 +106,10 @@ def set_dev_version(target_packages: List[ParsedSetup], build_id: str):
             set_version_py(target_package.setup_filename, new_version)
             set_dev_classifier(target_package.setup_filename, new_version)
             print("{0}: {1} -> {2}".format(target_package.name, target_package.version, new_version))
-        except:
+        except Exception as e:
             print("Could not set dev version for package: {0}".format(target_package.name))
+            logger.error(str(e))
+
+
+if __name__ == "__main__":
+    version_set_dev_main()

eng/tools/azure-sdk-tools/ci_tools/versioning/version_shared.py

@@ -82,7 +82,10 @@ def set_version_py(setup_path, new_version):
     version_py_location = get_version_py(setup_path)
 
     if not version_py_location:
-        logger.error("No version.py file found in {}".format(setup_path))
+        if "nspkg" in setup_path:
+            logger.warning(f"No version.py file found in {setup_path}. This is expected for nspkg packages.")
+            return
+        logger.error(f"No version.py file found in {setup_path}")
         sys.exit(1)
 
     version_contents = ""