Skip to content

Commit

Permalink
Update get_package_properties to also return path to setup.py (#16946)
Browse files Browse the repository at this point in the history
* return package path alongside rest of the tuple in common_tasks.py::get_package_properties
  • Loading branch information
scbedd authored Feb 25, 2021
1 parent e093f3e commit f84913b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion eng/scripts/Language-Settings.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function Get-python-PackageInfoFromRepo ($pkgPath, $serviceDirectory, $pkgName)
$setupProps = $null
try{
pip install packaging==20.4 -q -I
$setupProps = (python -c "import sys; import os; sys.path.append(os.path.join('scripts', 'devops_tasks')); from common_tasks import get_package_properties; obj=get_package_properties('$setupLocation'); print('{0},{1},{2}'.format(obj[0], obj[1], obj[2]));") -split ","
$setupProps = (python -c "import sys; import os; sys.path.append(os.path.join('scripts', 'devops_tasks')); from common_tasks import get_package_properties; obj=get_package_properties('$setupLocation'); print('{0},{1},{2},{3}'.format(obj[0], obj[1], obj[2], obj[3]));") -split ","
}
catch
{
Expand Down
2 changes: 1 addition & 1 deletion scripts/devops_tasks/common_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -475,4 +475,4 @@ def get_package_properties(setup_py_path):
"""
pkgName, version, _, requires = parse_setup(setup_py_path)
is_new_sdk = pkgName in NEW_REQ_PACKAGES or any(map(lambda x: (parse_require(x)[0] in NEW_REQ_PACKAGES), requires))
return pkgName, version, is_new_sdk
return pkgName, version, is_new_sdk, setup_py_path

0 comments on commit f84913b

Please sign in to comment.