From a47294b4f010a941e6739598b6ccda435bde6838 Mon Sep 17 00:00:00 2001 From: Keith Doggett Date: Mon, 10 Jun 2024 15:00:31 -0400 Subject: [PATCH] update dependencies --- .gitignore | 3 ++- .rubocop.yml | 2 ++ spatial_stats.gemspec | 6 +++--- test/dummy/.ruby-version | 2 +- test/dummy/config/initializers/assets.rb | 2 +- test/test_helper.rb | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 7c3a39f..cb18398 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,5 @@ test/dummy/storage/ test/dummy/tmp/ test/dummy/test tmp/ -Gemfile.lock \ No newline at end of file +Gemfile.lock +.ruby-version \ No newline at end of file diff --git a/.rubocop.yml b/.rubocop.yml index ccba2f3..15e3f59 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,3 +1,5 @@ +TargetRubyVersion: 3.1 + Metrics/MethodLength: Enabled: false diff --git a/spatial_stats.gemspec b/spatial_stats.gemspec index 83a830c..13cd606 100644 --- a/spatial_stats.gemspec +++ b/spatial_stats.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |spec| 'inside your rails app. Supports contiguious and distance-based'\ ' calculations.' spec.license = 'BSD-3-Clause' - spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0') + spec.required_ruby_version = Gem::Requirement.new('>= 3.1.0') spec.metadata['homepage_uri'] = spec.homepage spec.metadata['source_code_uri'] = spec.homepage @@ -41,8 +41,8 @@ Gem::Specification.new do |spec| spec.add_dependency 'numo-narray', '~>0.9.1' spec.add_dependency 'rails', '>= 6.0.0' - spec.add_development_dependency 'activerecord-postgis-adapter', '~> 6.0.0' - spec.add_development_dependency 'database_cleaner', '~> 1.8.3' + spec.add_development_dependency 'activerecord-postgis-adapter', '>= 6.0.0' + spec.add_development_dependency 'database_cleaner', '~> 2.0.2' spec.add_development_dependency 'pg', '~> 1.0' spec.add_development_dependency 'rake-compiler', '~>1.1.0' spec.add_development_dependency 'ruby-prof', '~> 1.3.1' diff --git a/test/dummy/.ruby-version b/test/dummy/.ruby-version index 4560fb9..27fea83 100644 --- a/test/dummy/.ruby-version +++ b/test/dummy/.ruby-version @@ -1 +1 @@ -ruby-2.6.3 +ruby-3.3 diff --git a/test/dummy/config/initializers/assets.rb b/test/dummy/config/initializers/assets.rb index bcafccd..8968b92 100644 --- a/test/dummy/config/initializers/assets.rb +++ b/test/dummy/config/initializers/assets.rb @@ -3,7 +3,7 @@ # Be sure to restart your server when you modify this file. # Version of your assets, change this if you want to expire all your assets. -Rails.application.config.assets.version = '1.0' +# Rails.application.config.assets.version = '1.0' # Add additional assets to the asset load path. # Rails.application.config.assets.paths << Emoji.images_path diff --git a/test/test_helper.rb b/test/test_helper.rb index f691fc8..64c4839 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -23,7 +23,7 @@ require 'database_cleaner' class ActiveSupport::TestCase - ActiveRecord::Migration.check_pending! + ActiveRecord::Migration.check_all_pending! DatabaseCleaner.strategy = :truncation setup { DatabaseCleaner.start } teardown { DatabaseCleaner.clean }