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

Apply easy to understand Sorbet typing corrections

Browse Source 
Co-authored-by: Mike McQuaid <mike@mikemcquaid.com>
This commit is contained in:
Issy Long 2025-01-15 23:10:52 +00:00
parent 7a88125df0
commit 599616e8e0
No known key found for this signature in database
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,9 +168,10 @@ module Utils
sig { returns(T::Boolean) } sig { returns(T::Boolean) }
def messages_displayed? def messages_displayed?
!!(config_true?(:analyticsmessage) && return false unless config_true?(:analyticsmessage)
config_true?(:caskanalyticsmessage) && return false unless config_true?(:caskanalyticsmessage)
influx_message_displayed?)
influx_message_displayed?
end end
sig { returns(T::Boolean) } sig { returns(T::Boolean) }

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

@ -98,7 +98,9 @@ module PyPI
def to_s def to_s
if valid_pypi_package? if valid_pypi_package?
out = T.must(name) out = T.must(name)
out += "[#{extras&.join(",")}]" if extras.present? if (pypi_extras = extras.presence)
out += "[#{pypi_extras.join(",")}]"
end
out += "==#{version}" if version.present? out += "==#{version}" if version.present?
out out
else else
@ -328,12 +330,16 @@ module PyPI
# Resolve the dependency tree of all input packages # Resolve the dependency tree of all input packages
show_info = !print_only && !silent show_info = !print_only && !silent
ohai "Retrieving PyPI dependencies for \"#{input_packages.join(" ")}\"..." if show_info ohai "Retrieving PyPI dependencies for \"#{input_packages.join(" ")}\"..." if show_info
found_packages = pip_report(input_packages, python_name:, print_stderr: !(verbose && show_info).nil?) print_stderr = !(verbose && show_info).nil?
found_packages = pip_report(input_packages, python_name:, print_stderr:)
# Resolve the dependency tree of excluded packages to prune the above # Resolve the dependency tree of excluded packages to prune the above
exclude_packages.delete_if { |package| found_packages.exclude? package } exclude_packages.delete_if { |package| found_packages.exclude? package }
ohai "Retrieving PyPI dependencies for excluded \"#{exclude_packages.join(" ")}\"..." if show_info ohai "Retrieving PyPI dependencies for excluded \"#{exclude_packages.join(" ")}\"..." if show_info
exclude_packages = pip_report(exclude_packages, python_name:, print_stderr: !(verbose && show_info).nil?) print_stderr = !(verbose && show_info).nil?
exclude_packages += [Package.new(T.must(main_package.name))] unless main_package.nil? exclude_packages = pip_report(exclude_packages, python_name:, print_stderr:)
if (main_package_name = main_package&.name)
exclude_packages += [Package.new(main_package_name)]
end
new_resource_blocks = "" new_resource_blocks = ""
found_packages.sort.each do |package| found_packages.sort.each do |package|