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

Merge pull request #10330 from bayandin/pipgrip-resolve-conflicts

Browse Source 
utils/pypi: allow pipgrip to resolve conflicts
This commit is contained in:
Alexander Bayandin 2021-01-18 10:25:14 +00:00 committed by GitHub
commit 5ce24f6068
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,30 +208,19 @@ module PyPI
@pipgrip_installed ||= Formula["pipgrip"].any_version_installed? @pipgrip_installed ||= Formula["pipgrip"].any_version_installed?
odie '"pipgrip" must be installed (`brew install pipgrip`)' unless @pipgrip_installed odie '"pipgrip" must be installed (`brew install pipgrip`)' unless @pipgrip_installed
found_packages = [] ohai "Retrieving PyPI dependencies for \"#{input_packages.join(" ")}\"..." if !print_only && !silent
input_packages.each do |package| command = [Formula["pipgrip"].bin/"pipgrip", "--json", "--no-cache-dir", *input_packages.map(&:to_s)]
ohai "Retrieving PyPI dependencies for \"#{package}\"..." if !print_only && !silent pipgrip_output = Utils.popen_read(*command)
pipgrip_output = Utils.popen_read Formula["pipgrip"].bin/"pipgrip", "--json", "--no-cache-dir", package.to_s unless $CHILD_STATUS.success?
unless $CHILD_STATUS.success? odie <<~EOS
odie <<~EOS Unable to determine dependencies for \"#{input_packages.join(" ")}\" because of a failure when running
Unable to determine dependencies for \"#{package}\" because of a failure when running `#{command.join(" ")}`.
`pipgrip --json --no-cache-dir #{package}`. Please update the resources for \"#{formula.name}\" manually.
Please update the resources for \"#{formula.name}\" manually. EOS
EOS end
end
JSON.parse(pipgrip_output).to_h.each do |new_name, new_version| found_packages = JSON.parse(pipgrip_output).to_h.map do |new_name, new_version|
new_package = Package.new("#{new_name}==#{new_version}") Package.new("#{new_name}==#{new_version}")
found_packages.each do |existing_package|
if existing_package.same_package?(new_package) && existing_package.version != new_package.version
odie "Conflicting versions found for the `#{new_package.name}` resource: "\
"#{existing_package.version}, #{new_package.version}"
end
end
found_packages << new_package unless found_packages.include? new_package
end
end end
# Remove extra packages that may be included in pipgrip output # Remove extra packages that may be included in pipgrip output