diff --git a/Gemfile b/Gemfile index 1423e58f7..9428dba99 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 209edae61..bbf50ea21 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -119,7 +119,7 @@ GEM congestion (0.1.0) connection_pool (>= 2.0) redis (>= 3.1) - connection_pool (2.4.0) + connection_pool (2.4.1) crack (0.4.5) rexml crass (1.0.6) @@ -388,7 +388,10 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - redis (4.8.1) + redis (5.0.6) + redis-client (>= 0.9.0) + redis-client (0.14.1) + connection_pool regexp_parser (2.3.1) request_store (1.5.1) rack (>= 1.4) @@ -453,10 +456,11 @@ GEM nokogiri (>= 1.12.0) scientist (1.6.4) shellany (0.0.1) - sidekiq (6.5.8) - connection_pool (>= 2.2.5, < 3) - rack (~> 2.0) - redis (>= 4.5.0, < 5) + sidekiq (7.1.0) + concurrent-ruby (< 2) + connection_pool (>= 2.3.0) + rack (>= 2.2.4) + redis-client (>= 0.14.0) sidekiq-congestion (0.1.1) congestion (~> 0.1) sidekiq (>= 3.0) @@ -464,12 +468,11 @@ GEM fugit (~> 1.8) globalid (>= 1.0.1) sidekiq (>= 6) - sidekiq-unique-jobs (7.1.29) + sidekiq-unique-jobs (8.0.2) brpoplpush-redis_script (> 0.1.1, <= 2.0.0) 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) @@ -490,7 +493,7 @@ GEM activesupport colorize (>= 0.8.1) rest-client (>= 2.0.2) - thor (1.2.1) + thor (1.2.2) timeout (0.3.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) @@ -577,7 +580,7 @@ DEPENDENCIES rubocop-rails rubocop-rspec scientist (~> 1.6.4) - sidekiq (< 7) + sidekiq (< 8) sidekiq-congestion (~> 0.1.0) sidekiq-cron sidekiq-unique-jobs