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

update references to homebrew-virtualenv resources

Browse Source
This commit is contained in:
Rylan Polster 2020-10-06 23:22:07 -04:00
parent 43648100b4
commit 0109ce58be
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,7 +145,7 @@ module Homebrew
check_closed_pull_requests(formula, tap_full_name, version: new_version, args: args) if new_version check_closed_pull_requests(formula, tap_full_name, version: new_version, args: args) if new_version
opoo "This formula has patches that may be resolved upstream." if formula.patchlist.present? opoo "This formula has patches that may be resolved upstream." if formula.patchlist.present?
if formula.resources.present? && formula.resources.any? { |resource| resource.name != "homebrew-virtualenv" } if formula.resources.any? { |resource| !resource.name.start_with?("homebrew-") }
opoo "This formula has resources that may need to be updated." opoo "This formula has resources that may need to be updated."
end end
@ -339,8 +339,7 @@ module Homebrew
run_audit(formula, alias_rename, old_contents, args: args) run_audit(formula, alias_rename, old_contents, args: args)
pr_message = "Created with `brew bump-formula-pr`." pr_message = "Created with `brew bump-formula-pr`."
if resources_checked.nil? && formula.resources.present? && if resources_checked.nil? && formula.resources.any? { |resource| !resource.name.start_with?("homebrew-") }
formula.resources.any? { |resource| resource.name != "homebrew-virtualenv" }
pr_message += <<~EOS pr_message += <<~EOS

2
Library/Homebrew/language/python.rb
View File

@ -289,7 +289,7 @@ module Language
targets = Array(targets) targets = Array(targets)
targets.each do |t| targets.each do |t|
if t.respond_to? :stage if t.respond_to? :stage
next if t.name == "homebrew-virtualenv" next if t.name.start_with? "homebrew-"
t.stage { do_install Pathname.pwd } t.stage { do_install Pathname.pwd }
else else

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

@ -142,9 +142,8 @@ module PyPI
return return
end end
# Check whether resources already exist (excluding homebrew-virtualenv) # Check whether resources already exist (excluding virtualenv dependencies)
if formula.resources.blank? || if formula.resources.all? { |resource| resource.name.start_with?("homebrew-") }
(formula.resources.length == 1 && formula.resources.first.name == "homebrew-virtualenv")
# Place resources above install method # Place resources above install method
inreplace_regex = / def install/ inreplace_regex = / def install/
new_resource_blocks += " def install" new_resource_blocks += " def install"