From 982e36224c13a70233d688d8388d075182463d09 Mon Sep 17 00:00:00 2001 From: Graeme Porteous Date: Tue, 14 Jan 2025 10:07:36 +0000 Subject: [PATCH 1/2] Add default gems to our Gemfile These gems will be removed from the standard gems shipped with Ruby 3.4 and to continue using them we need to bundle them ourselves. --- Gemfile | 2 ++ Gemfile.lock | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/Gemfile b/Gemfile index 7422505d15..fa7592f2a7 100644 --- a/Gemfile +++ b/Gemfile @@ -137,6 +137,8 @@ gem 'zip_tricks', '~> 5.6.0' # Gems that are part of Ruby's standard library but need version constraints as # they are required by other Gem dependencies +gem 'csv', '~> 3.3.2' +gem 'drb', '~> 2.2.1' gem 'uri', '~> 1.0.2' # Gems only used by the research export task diff --git a/Gemfile.lock b/Gemfile.lock index 7b1e353481..3d97502c13 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -182,6 +182,7 @@ GEM bigdecimal rexml crass (1.0.6) + csv (3.3.2) dalli (3.2.8) dante (0.2.0) date (3.4.1) @@ -190,6 +191,7 @@ GEM digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) docile (1.4.0) + drb (2.2.1) erubi (1.13.1) execjs (2.9.1) factory_bot (6.5.0) @@ -614,7 +616,9 @@ DEPENDENCIES capistrano (~> 2.15.11) capybara (~> 3.40.0) charlock_holmes (~> 0.7.9) + csv (~> 3.3.2) dalli (~> 3.2.8) + drb (~> 2.2.1) excel_analyzer! exception_notification! factory_bot_rails (~> 6.4.4) From 75f061be3592b79cb84344e84e3ef158d06eea96 Mon Sep 17 00:00:00 2001 From: Graeme Porteous Date: Mon, 18 Dec 2023 11:38:39 +0000 Subject: [PATCH 2/2] Add support for Ruby 3.3 Fixes #8056 --- .github/workflows/ci.yml | 1 + README.md | 1 + doc/CHANGES.md | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b89359d9db..864dcf9599 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,6 +54,7 @@ jobs: matrix: include: - { ruby: '3.2', postgres: 13.5 } + - { ruby: '3.3', postgres: 13.5 } services: postgres: diff --git a/README.md b/README.md index 71c6dea15a..50a55314cd 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,7 @@ see [the project website](http://alaveteli.org) for instructions on installing A Every Alaveteli commit is tested by GitHub Actions on the [following Ruby platforms](https://github.com/mysociety/alaveteli/blob/develop/.github/workflows/ci.yml#L27-L29) * ruby-3.2 +* ruby-3.3 If you use a ruby version management tool (such as RVM or .rbenv) and want to use the default development version used by the Alaveteli team (currently 3.2.6), you can create a `.ruby-version` symlink with a target of `.ruby-version.example` to switch to that automatically in the project directory. diff --git a/doc/CHANGES.md b/doc/CHANGES.md index 8b6b98eb81..7768f28aeb 100644 --- a/doc/CHANGES.md +++ b/doc/CHANGES.md @@ -2,6 +2,7 @@ ## Highlighted Features +* Add support for Ruby 3.3 (Graeme Porteous) * Update Rails application framework defaults (Graeme Porteous) * Drop support for Ruby 3.1 (Graeme Porteous)