From 075ae9eb1eaf6fff0a325a552ad92c2e8243552a Mon Sep 17 00:00:00 2001 From: Rylan Polster Date: Fri, 31 Jul 2020 16:42:53 -0400 Subject: [PATCH 1/4] update-python-resources: add blocklist --- Library/Homebrew/utils/pypi.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Library/Homebrew/utils/pypi.rb b/Library/Homebrew/utils/pypi.rb index acc3573a6c..ac3800da97 100644 --- a/Library/Homebrew/utils/pypi.rb +++ b/Library/Homebrew/utils/pypi.rb @@ -5,6 +5,12 @@ module PyPI PYTHONHOSTED_URL_PREFIX = "https://files.pythonhosted.org/packages/" + AUTOMATIC_RESOURCE_UPDATE_BLOCKLIST = %w[ + diffoscope + dxpy + molecule + ].freeze + @pipgrip_installed = nil def url_to_pypi_package_name(url) @@ -41,6 +47,11 @@ module PyPI def update_python_resources!(formula, version = nil, print_only: false, silent: false, ignore_non_pypi_packages: false) + if !print_only && AUTOMATIC_RESOURCE_UPDATE_BLOCKLIST.include?(formula.name) + odie "The resources for \"#{formula.name}\" need special attention. Please update them manually." + return + end + # PyPI package name isn't always the same as the formula name. Try to infer from the URL. pypi_name = if formula.stable.url.start_with?(PYTHONHOSTED_URL_PREFIX) url_to_pypi_package_name formula.stable.url From 57cac495594aa36544e8ec5749cf66c5f918de2d Mon Sep 17 00:00:00 2001 From: Rylan Polster Date: Fri, 31 Jul 2020 20:59:22 -0400 Subject: [PATCH 2/4] Use formula.full_name for blocklist --- Library/Homebrew/utils/pypi.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/utils/pypi.rb b/Library/Homebrew/utils/pypi.rb index ac3800da97..0b3d1fa3bb 100644 --- a/Library/Homebrew/utils/pypi.rb +++ b/Library/Homebrew/utils/pypi.rb @@ -47,7 +47,7 @@ module PyPI def update_python_resources!(formula, version = nil, print_only: false, silent: false, ignore_non_pypi_packages: false) - if !print_only && AUTOMATIC_RESOURCE_UPDATE_BLOCKLIST.include?(formula.name) + if !print_only && AUTOMATIC_RESOURCE_UPDATE_BLOCKLIST.include?(formula.full_name) odie "The resources for \"#{formula.name}\" need special attention. Please update them manually." return end From 1f5479798c09e9e78afb8059c5ddc322751e65e7 Mon Sep 17 00:00:00 2001 From: Rylan Polster Date: Fri, 31 Jul 2020 20:59:49 -0400 Subject: [PATCH 3/4] Add ansible and ansible@2.8 to blocklist --- Library/Homebrew/utils/pypi.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Library/Homebrew/utils/pypi.rb b/Library/Homebrew/utils/pypi.rb index 0b3d1fa3bb..c4fa8af52f 100644 --- a/Library/Homebrew/utils/pypi.rb +++ b/Library/Homebrew/utils/pypi.rb @@ -6,6 +6,8 @@ module PyPI PYTHONHOSTED_URL_PREFIX = "https://files.pythonhosted.org/packages/" AUTOMATIC_RESOURCE_UPDATE_BLOCKLIST = %w[ + ansible + ansible@2.8 diffoscope dxpy molecule From 9fb3a80e383f11e94e763cae048efecaf87a52d3 Mon Sep 17 00:00:00 2001 From: Rylan Polster Date: Sun, 2 Aug 2020 11:30:10 -0400 Subject: [PATCH 4/4] Add cloudformation-cli to blocklist --- Library/Homebrew/utils/pypi.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Library/Homebrew/utils/pypi.rb b/Library/Homebrew/utils/pypi.rb index c4fa8af52f..2599a9f503 100644 --- a/Library/Homebrew/utils/pypi.rb +++ b/Library/Homebrew/utils/pypi.rb @@ -8,6 +8,7 @@ module PyPI AUTOMATIC_RESOURCE_UPDATE_BLOCKLIST = %w[ ansible ansible@2.8 + cloudformation-cli diffoscope dxpy molecule