Merge 7_29

.github/workflows/ruby.yml

@@ -61,7 +61,7 @@ jobs:
     - name: Install dependencies
       run: |
         . $HOME/.nvm/nvm.sh
-        nvm install 22.16
+        nvm install 24.18
         nvm use stable
         bundle install
     - name: Run overcommit
@@ -95,7 +95,7 @@ jobs:
     - name: Install dependencies
       run: |
         . $HOME/.nvm/nvm.sh
-        nvm install 22.16
+        nvm install 24.18
         nvm use stable
         bundle install
         git clone -b cypress_v7 https://github.com/projecttacoma/cqm-execution-service.git /tmp/cqm-execution-service-56
@@ -138,7 +138,7 @@ jobs:
     - name: Install dependencies
       run: |
         . $HOME/.nvm/nvm.sh
-        nvm install 22.16
+        nvm install 24.18
         nvm use stable
         bundle install
         git clone -b cypress_v7 https://github.com/projecttacoma/cqm-execution-service.git /tmp/cqm-execution-service-56
@@ -181,7 +181,7 @@ jobs:
     - name: Install dependencies
       run: |
         . $HOME/.nvm/nvm.sh
-        nvm install 22.16
+        nvm install 24.18
         nvm use stable
         bundle install
         git clone -b cypress_v7 https://github.com/projecttacoma/cqm-execution-service.git /tmp/cqm-execution-service-56
@@ -224,7 +224,7 @@ jobs:
     - name: Install dependencies
       run: |
         . $HOME/.nvm/nvm.sh
-        nvm install 22.16
+        nvm install 24.18
         nvm use stable
         bundle install
         git clone -b cypress_v7 https://github.com/projecttacoma/cqm-execution-service.git /tmp/cqm-execution-service-56
@@ -264,7 +264,7 @@ jobs:
     - name: Install dependencies
       run: |
         . $HOME/.nvm/nvm.sh
-        nvm install 22.16
+        nvm install 24.18
         nvm use stable
         bundle install
         git clone -b cypress_v7 https://github.com/projecttacoma/cqm-execution-service.git /tmp/cqm-execution-service-56
@@ -331,7 +331,7 @@ jobs:
     - name: Install dependencies
       run: |
         . $HOME/.nvm/nvm.sh
-        nvm install 22.16
+        nvm install 24.18
         nvm use stable
         bundle install
         git clone -b cypress_v7 https://github.com/projecttacoma/cqm-execution-service.git /tmp/cqm-execution-service-56
@@ -389,7 +389,7 @@ jobs:
     - name: Install dependencies
       run: |
         . $HOME/.nvm/nvm.sh
-        nvm install 22.16
+        nvm install 24.18
         nvm use stable
         bundle install
         git clone -b cypress_v7 https://github.com/projecttacoma/cqm-execution-service.git /tmp/cqm-execution-service-56

.rubocop.yml

@@ -105,6 +105,7 @@ Metrics/ClassLength:
     - 'lib/cypress/demographics_randomizer.rb'
     - 'lib/cypress/expected_results_calculator.rb'
     - 'lib/cypress/population_clone_job.rb'
+    - 'lib/cypress/scoop_and_filter.rb'
     - 'lib/validators/cat3_population_validator.rb'
 Metrics/CyclomaticComplexity:
   Max: 12

Gemfile

@@ -5,7 +5,7 @@ source 'https://rubygems.org'
 ruby '3.4.9'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 8.0.0', '>= 8.0.2.1'
+gem 'rails', '~> 8.1.0'
 
 gem 'propshaft'
 
@@ -20,7 +20,7 @@ gem 'mustache'
 
 gem 'cqm-models', '~> 4.2.0'
 gem 'cqm-parsers', '~> 4.1.1.2'
-gem 'cqm-reports', '~> 4.1.6'
+gem 'cqm-reports', '~> 4.1.9'
 gem 'cqm-validators', '~> 4.0.6'
 
 # # Use faker to generate addresses
@@ -126,7 +126,6 @@ group :development, :test do
   # remove scss_lint, incompatible with sass dependency upgrades
   # gem 'scss_lint', require: false
   gem 'selenium-webdriver'
-  gem 'webrick'
 end
 
 group :development do