Skip to content

Do not detect package from deleted files #5253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lmazuel merged 1 commit into from
May 15, 2019
Merged

Do not detect package from deleted files #5253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions azure-sdk-tools/packaging_tools/drop_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,11 @@ def build_package_from_pr_number(gh_token, sdk_id, pr_number, output_folder, *,
con = Github(gh_token)
repo = con.get_repo(sdk_id)
sdk_pr = repo.get_pull(pr_number)
files = [one_file.filename for one_file in sdk_pr.get_files() if one_file.status not in ['removed']]
# "get_files" of Github only download the first 300 files. Might not be enough.
package_names = {('.', f.filename.split('/')[0]) for f in sdk_pr.get_files() if f.filename.startswith("azure")}
package_names = {('.', f.split('/')[0]) for f in files if f.startswith("azure")}
# Handle the SDK folder as well
matches = {_SDK_FOLDER_RE.search(f.filename) for f in sdk_pr.get_files()}
matches = {_SDK_FOLDER_RE.search(f) for f in files}
package_names.update({match.groups() for match in matches if match is not None})

absolute_output_folder = Path(output_folder).resolve()
Expand Down
5 changes: 3 additions & 2 deletions azure-sdk-tools/packaging_tools/update_pr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@ def update_pr(gh_token, repo_id, pr_number):
con = Github(gh_token)
repo = con.get_repo(repo_id)
sdk_pr = repo.get_pull(pr_number)
files = [one_file.filename for one_file in sdk_pr.get_files() if one_file.status not in ['removed']]
# "get_files" of Github only download the first 300 files. Might not be enough.
package_names = {('.', f.filename.split('/')[0]) for f in sdk_pr.get_files() if f.filename.startswith("azure")}
package_names = {('.', f.split('/')[0]) for f in files if f.startswith("azure")}
# Handle the SDK folder as well
matches = {_SDK_FOLDER_RE.search(f.filename) for f in sdk_pr.get_files()}
matches = {_SDK_FOLDER_RE.search(f) for f in files}
package_names.update({match.groups() for match in matches if match is not None})

# Get PR branch to push
Expand Down