pypi: allow packages in global exclude list if explicitly requested

This commit is contained in:
Dustin Rodrigues 2021-01-18 09:01:15 -05:00
parent 5ce24f6068
commit d87844ae8b

View File

@ -182,6 +182,9 @@ module PyPI
extra_packages = (extra_packages || []).map { |p| Package.new p } extra_packages = (extra_packages || []).map { |p| Package.new p }
exclude_packages = (exclude_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] input_packages = [main_package]
extra_packages.each do |extra_package| extra_packages.each do |extra_package|
@ -223,10 +226,6 @@ module PyPI
Package.new("#{new_name}==#{new_version}") Package.new("#{new_name}==#{new_version}")
end 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 = "" new_resource_blocks = ""
found_packages.sort.each do |package| found_packages.sort.each do |package|
if exclude_packages.include? package if exclude_packages.include? package