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

Merge pull request #16367 from cho-m/pypi-use-formula-py

Browse Source 
utils/pypi: use python from formula
This commit is contained in:
Michael Cho 2023-12-30 10:57:49 -05:00 committed by GitHub
commit 04d8ae20f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -276,15 +276,25 @@ module PyPI
end end
end end
ensure_formula_installed!("python") python_deps = formula.deps
.map(&:to_formula)
.select { |f| f.name.start_with?("python@") }
.sort_by(&:version)
.reverse
python_name = if python_deps.empty?
"python"
else
(python_deps.find(&:any_version_installed?) || python_deps.first).name
end
ensure_formula_installed!(python_name)
# Resolve the dependency tree of all input packages # Resolve the dependency tree of all input packages
ohai "Retrieving PyPI dependencies for \"#{input_packages.join(" ")}\"..." if !print_only && !silent ohai "Retrieving PyPI dependencies for \"#{input_packages.join(" ")}\"..." if !print_only && !silent
found_packages = pip_report(input_packages) found_packages = pip_report(input_packages, python_name: python_name)
# Resolve the dependency tree of excluded packages to prune the above # Resolve the dependency tree of excluded packages to prune the above
exclude_packages.delete_if { |package| found_packages.exclude? package } exclude_packages.delete_if { |package| found_packages.exclude? package }
ohai "Retrieving PyPI dependencies for excluded \"#{exclude_packages.join(" ")}\"..." if !print_only && !silent ohai "Retrieving PyPI dependencies for excluded \"#{exclude_packages.join(" ")}\"..." if !print_only && !silent
exclude_packages = pip_report(exclude_packages) + [Package.new(main_package.name)] exclude_packages = pip_report(exclude_packages, python_name: python_name) + [Package.new(main_package.name)]
new_resource_blocks = "" new_resource_blocks = ""
found_packages.sort.each do |package| found_packages.sort.each do |package|
@ -348,10 +358,10 @@ module PyPI
name.gsub(/[-_.]+/, "-").downcase name.gsub(/[-_.]+/, "-").downcase
end end
def self.pip_report(packages) def self.pip_report(packages, python_name: "python")
return [] if packages.blank? return [] if packages.blank?
command = [Formula["python"].bin/"python3", "-m", "pip", "install", "-q", "--dry-run", command = [Formula[python_name].libexec/"bin/python", "-m", "pip", "install", "-q", "--dry-run",
"--ignore-installed", "--report=/dev/stdout", *packages.map(&:to_s)] "--ignore-installed", "--report=/dev/stdout", *packages.map(&:to_s)]
pip_output = Utils.popen_read({ "PIP_REQUIRE_VIRTUALENV" => "false" }, *command) pip_output = Utils.popen_read({ "PIP_REQUIRE_VIRTUALENV" => "false" }, *command)
unless $CHILD_STATUS.success? unless $CHILD_STATUS.success?