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

Merge pull request #10356 from dtrodrigues/pypi-extra

Browse Source 
pypi: allow packages in global exclude list if explicitly requested
This commit is contained in:
Dustin Rodrigues 2021-01-19 10:30:35 -05:00 committed by GitHub
commit 3e074419d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,6 +182,9 @@ module PyPI
extra_packages = (extra_packages || []).map { |p| Package.new p }
exclude_packages = (exclude_packages || []).map { |p| Package.new p }
exclude_packages += %W[#{main_package.name} argparse pip setuptools wheel wsgiref].map { |p| Package.new p }
# remove packages from the exclude list if we've explicitly requested them as an extra package
exclude_packages.delete_if { |package| extra_packages.include?(package) }
input_packages = [main_package]
extra_packages.each do |extra_package|
@ -223,10 +226,6 @@ module PyPI
Package.new("#{new_name}==#{new_version}")
end
# Remove extra packages that may be included in pipgrip output
exclude_list = %W[#{main_package.name} argparse pip setuptools wheel wsgiref].map { |p| Package.new p }
found_packages.delete_if { |package| exclude_list.include? package }
new_resource_blocks = ""
found_packages.sort.each do |package|
if exclude_packages.include? package