From ee95f9939d5654a3f5477df5042facef48e6b8f9 Mon Sep 17 00:00:00 2001 From: Issy Long Date: Wed, 3 Apr 2024 00:12:28 +0100 Subject: [PATCH] Fix RuboCop and exclude `psych` from RBI generation --- Library/Homebrew/Gemfile | 2 +- Library/Homebrew/sorbet/tapioca/config.yml | 2 +- Library/Homebrew/test/spec_helper.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/Gemfile b/Library/Homebrew/Gemfile index 1f20df7d6dbd1..b4bedd6060e6e 100644 --- a/Library/Homebrew/Gemfile +++ b/Library/Homebrew/Gemfile @@ -48,9 +48,9 @@ group :style, optional: true do gem "rubocop-sorbet", require: false end group :tests, optional: true do - gem "psych", "< 5", require: false gem "debug", require: false gem "parallel_tests", require: false + gem "psych", "< 5", require: false gem "rspec", require: false gem "rspec-github", require: false gem "rspec_junit_formatter", require: false diff --git a/Library/Homebrew/sorbet/tapioca/config.yml b/Library/Homebrew/sorbet/tapioca/config.yml index 6373d611389c6..94ad259871689 100644 --- a/Library/Homebrew/sorbet/tapioca/config.yml +++ b/Library/Homebrew/sorbet/tapioca/config.yml @@ -6,7 +6,6 @@ gem: - json - msgpack # These aren't needed: - - byebug - coderay - commander - debug @@ -19,6 +18,7 @@ gem: - language_server-protocol - netrc - parallel + - psych - public_suffix - racc - rdoc diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb index 2de31df22eb4d..c36ea110f3482 100644 --- a/Library/Homebrew/test/spec_helper.rb +++ b/Library/Homebrew/test/spec_helper.rb @@ -230,7 +230,7 @@ @__stdin = $stdin.clone begin - if !example.metadata.keys.include?(:focus) && !ENV.key?("HOMEBREW_VERBOSE_TESTS") + if example.metadata.keys.exclude?(:focus) && !ENV.key?("HOMEBREW_VERBOSE_TESTS") $stdout.reopen(File::NULL) $stderr.reopen(File::NULL) $stdin.reopen(File::NULL)