Merge branch 'main' into origin/cds/main/flipper-1.3.4

ualbertalib · Mar 7, 2025 · 5ada2a1 · 5ada2a1
2 parents 76dba58 + ecf1a01
commit 5ada2a1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ New entries in this file should aim to provide a meaningful amount of informatio
 ### Chores
 * Bump bundler in Gemfile.lock to match production and build environments 
 * Bump erb_lint from 0.7.0 to 0.9.0 [PR#3689](https://github.com/ualbertalib/jupiter/pull/3689)
+* Bump rubocop from 1.71.2 to 1.73.2 by @dependabot in https://github.com/ualbertalib/jupiter/pull/3738
 
 ## 2.10.2 - 2025-01-15
 

diff --git a/Gemfile b/Gemfile
@@ -94,7 +94,7 @@ group :development, :test do
   # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
   gem 'debug', platforms: [:mri, :mingw, :x64_mingw]
 
-  gem 'rubocop', '~> 1.71.2', require: false
+  gem 'rubocop', '~> 1.73.2', require: false
   gem 'rubocop-minitest', require: false
   gem 'rubocop-performance', require: false
   gem 'rubocop-rails', require: false

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -504,17 +504,18 @@ GEM
     rsolr (2.6.0)
       builder (>= 2.1.2)
       faraday (>= 0.9, < 3, != 2.0.0)
-    rubocop (1.71.2)
+    rubocop (1.73.2)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
       rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.38.0)
+    rubocop-ast (1.38.1)
       parser (>= 3.3.1.0)
     rubocop-minitest (0.37.0)
       lint_roller (~> 1.1)
@@ -706,7 +707,7 @@ DEPENDENCIES
   redis (~> 4.8)
   rollbar
   rsolr
-  rubocop (~> 1.71.2)
+  rubocop (~> 1.73.2)
   rubocop-minitest
   rubocop-performance
   rubocop-rails

diff --git a/lib/tasks/digitization_batch_ingest.rake b/lib/tasks/digitization_batch_ingest.rake
@@ -41,7 +41,9 @@ namespace :digitization do
       # - Give `title` 80 characters of space.
       # - `processing` should be the longest `status`
       # - batch `size` should be pretty small to ensure that the jobs can finish in a timely manner
+      # rubocop:disable Style/RedundantFormat
       puts format '%38s,%80s,%12s,%7s', 'id', 'title', 'status', 'size'
+      # rubocop:enable Style/RedundantFormat
       Digitization::BatchMetadataIngest.order(created_at: :desc).limit(limit).each do |batch_ingest|
         puts format '%38s,%80s,%12s,%7d', batch_ingest.id, batch_ingest.title, batch_ingest.status,
                     batch_ingest.books.count