admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #8758 from Rylan12/bump-formula-pr-resource-message

Browse Source 
bump-formula-pr: add message to check resources
This commit is contained in:
Rylan Polster 2020-09-18 15:12:56 -04:00 committed by GitHub
commit a8a921dfaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Library/Homebrew/dev-cmd/bump-formula-pr.rb
View File

@ -330,11 +330,22 @@ module Homebrew
end
unless args.dry_run?
PyPI.update_python_resources! formula, new_formula_version, silent: args.quiet?, ignore_non_pypi_packages: true
resources_checked = PyPI.update_python_resources! formula, new_formula_version,
silent: args.quiet?, ignore_non_pypi_packages: true
end
run_audit(formula, alias_rename, old_contents, args: args)
pr_message = "Created with `brew bump-formula-pr`."
if resources_checked.nil? && formula.resources.present? &&
formula.resources.any? { |resource| resource.name != "homebrew-virtualenv" }
pr_message += <<~EOS
`resource` blocks may require updates.
EOS
end
pr_info = {
sourcefile_path: formula.path,
old_contents: old_contents,
@ -345,7 +356,7 @@ module Homebrew
previous_branch: previous_branch,
tap: formula.tap,
tap_full_name: tap_full_name,
pr_message: "Created with `brew bump-formula-pr`.",
pr_message: pr_message,
}
GitHub.create_bump_pr(pr_info, args: args)
end

3
Library/Homebrew/utils/pypi.rb
View File

@ -56,6 +56,7 @@ module PyPI
[json["info"]["name"], sdist["url"], sdist["digests"]["sha256"]]
end
# Return true if resources were checked (even if no change)
def update_python_resources!(formula, version = nil, print_only: false, silent: false,
ignore_non_pypi_packages: false)
@ -160,5 +161,7 @@ module PyPI
end
s.sub! inreplace_regex, new_resource_blocks
end
true
end
end