diff --git a/debian/patches/0001-spec-spec_helper.rb-don-t-load-pry.patch b/debian/patches/0001-spec-spec_helper.rb-don-t-load-pry.patch index 24876cf5982c46172647a4b66cb042929e854fd6..ea57d65f366d00e259188d71ffd3f9cd29059ceb 100644 --- a/debian/patches/0001-spec-spec_helper.rb-don-t-load-pry.patch +++ b/debian/patches/0001-spec-spec_helper.rb-don-t-load-pry.patch @@ -7,9 +7,11 @@ pry is broken with ruby-slop >= 4.x spec/spec_helper.rb | 2 -- 1 file changed, 2 deletions(-) +diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb +index 5ac288a..a9196a8 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb -@@ -3,8 +3,6 @@ +@@ -3,8 +3,6 @@ if ENV['CI'] SimpleCov.start end @@ -17,4 +19,4 @@ pry is broken with ruby-slop >= 4.x - require 'rspec' require 'hashie' - require 'rspec/pending_for' + require 'json' diff --git a/debian/patches/0002-Suppress-keyword-arguments-warning-for-Ruby-2.7.0.patch b/debian/patches/0002-Suppress-keyword-arguments-warning-for-Ruby-2.7.0.patch deleted file mode 100644 index 5af6078c51c922e8b1acd35022376f9ae902071d..0000000000000000000000000000000000000000 --- a/debian/patches/0002-Suppress-keyword-arguments-warning-for-Ruby-2.7.0.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Koichi ITO <koic.ito@gmail.com> -Date: Wed, 15 Jan 2020 12:42:44 +0900 -Subject: Suppress keyword arguments warning for Ruby 2.7.0 - -This PR suppresses the following keyword arguments warning for Ruby 2.7.0. - -```console -% bundle exec rspec spec/hashie/extensions/mash/symbolize_keys_spec.rb -(snip) - -/Users/koic/src/github.com/hahie/hashie/spec/hashie/extensions/mash/symbolize_keys_spec.rb:29: -warning: Using the last argument as keyword parameters is -deprecated; maybe ** should be added to the call -/Users/koic/src/github.com/hahie/hashie/spec/hashie/extensions/mash/symbolize_keys_spec.rb:21: -warning: The called method `call' is defined here -``` - -For Ruby 2.8.0-dev (Ruby 3.0) the warning will be `ArgumentError`. -ruby/ruby#2794 - -Origin: https://github.com/hashie/hashie/commit/570409727e6ce02db3ad39579c49dcc73769ebc2.patch -Forwarded: https://github.com/hashie/hashie/pull/511 -Bug-Debian: https://bugs.debian.org/996239 ---- - spec/hashie/extensions/mash/symbolize_keys_spec.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/spec/hashie/extensions/mash/symbolize_keys_spec.rb b/spec/hashie/extensions/mash/symbolize_keys_spec.rb -index 1e52534..9846737 100644 ---- a/spec/hashie/extensions/mash/symbolize_keys_spec.rb -+++ b/spec/hashie/extensions/mash/symbolize_keys_spec.rb -@@ -26,7 +26,7 @@ RSpec.describe Hashie::Extensions::Mash::SymbolizeKeys do - end - let(:instance) { my_mash.new('outer' => { 'inner' => 42 }, 'testing' => [1, 2, 3]) } - -- subject { destructure.call(instance) } -+ subject { destructure.call(**instance) } - - it 'is converted on method calls' do - expect(subject).to eq(outer: { inner: 42 }, testing: [1, 2, 3]) diff --git a/debian/patches/series b/debian/patches/series index 7c66745b99831781817e1785a63f34788f18f3d1..9eb5093cb4c57575ba3a2ad2e5dd69179856add4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 0001-spec-spec_helper.rb-don-t-load-pry.patch -0002-Suppress-keyword-arguments-warning-for-Ruby-2.7.0.patch