diff --git a/Gemfile b/Gemfile index 765b4d7de..fb77a484b 100644 --- a/Gemfile +++ b/Gemfile @@ -50,7 +50,7 @@ end gem 'ranked-model', '~> 0.4.8' gem 'restpack_serializer', git: 'https://github.com/zooniverse/restpack_serializer.git', branch: 'panoptes-api-version', ref: '5f1ef6c2b2' gem 'scientist', '~> 1.6.4' -gem 'sidekiq', '< 7' +gem 'sidekiq', '< 8' gem 'sidekiq-congestion', '~> 0.1.0' gem 'sidekiq-cron' gem 'sidekiq-unique-jobs' diff --git a/Gemfile.lock b/Gemfile.lock index 227817122..b4e802370 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -107,9 +107,6 @@ GEM net-http-persistent (~> 4.0) nokogiri (~> 1, >= 1.10.8) bcrypt (3.1.18) - brpoplpush-redis_script (0.1.3) - concurrent-ruby (~> 1.0, >= 1.0.5) - redis (>= 1.0, < 6) builder (3.2.4) case_transform (0.2) activesupport @@ -255,6 +252,7 @@ GEM listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.1) lograge (0.13.0) actionpack (>= 4) activesupport (>= 4) @@ -348,7 +346,7 @@ GEM activesupport (>= 3.0.0) raabro (1.4.0) racc (1.7.1) - rack (2.2.8.1) + rack (2.2.10) rack-cors (1.1.1) rack (>= 2.0.0) rack-protection (3.0.5) @@ -390,7 +388,10 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - redis (4.8.1) + redis (5.3.0) + redis-client (>= 0.22.0) + redis-client (0.22.2) + connection_pool regexp_parser (2.3.1) request_store (1.5.1) rack (>= 1.4) @@ -455,10 +456,11 @@ GEM nokogiri (>= 1.12.0) scientist (1.6.4) shellany (0.0.1) - sidekiq (6.5.9) - connection_pool (>= 2.2.5, < 3) - rack (~> 2.0) - redis (>= 4.5.0, < 5) + sidekiq (7.3.6) + connection_pool (>= 2.3.0) + logger + rack (>= 2.2.4) + redis-client (>= 0.22.2) sidekiq-congestion (0.1.1) congestion (~> 0.1) sidekiq (>= 3.0) @@ -466,12 +468,10 @@ GEM fugit (~> 1.8) globalid (>= 1.0.1) sidekiq (>= 6) - sidekiq-unique-jobs (7.1.33) - brpoplpush-redis_script (> 0.1.1, <= 2.0.0) + sidekiq-unique-jobs (8.0.10) concurrent-ruby (~> 1.0, >= 1.0.5) - redis (< 5.0) - sidekiq (>= 5.0, < 7.0) - thor (>= 0.20, < 3.0) + sidekiq (>= 7.0.0, < 8.0.0) + thor (>= 1.0, < 3.0) spring (2.1.1) spring-commands-rspec (1.0.4) spring (>= 0.9.1) @@ -577,7 +577,7 @@ DEPENDENCIES rubocop-rails rubocop-rspec scientist (~> 1.6.4) - sidekiq (< 7) + sidekiq (< 8) sidekiq-congestion (~> 0.1.0) sidekiq-cron sidekiq-unique-jobs