Skip to content

Commit

Permalink
pypi: allow packages in global exclude list if explicitly requested
Browse files Browse the repository at this point in the history
  • Loading branch information
dtrodrigues committed Jan 18, 2021
1 parent 5ce24f6 commit d87844a
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions Library/Homebrew/utils/pypi.rb
Expand Up @@ -182,6 +182,9 @@ def update_python_resources!(formula, version: nil, package_name: nil, extra_pac

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|
Expand Down Expand Up @@ -223,10 +226,6 @@ def update_python_resources!(formula, version: nil, package_name: nil, extra_pac
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
Expand Down

0 comments on commit d87844a

Please sign in to comment.