Skip to content

Bump Ruby to 3.1 #5447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeffwidman merged 6 commits into from
Oct 7, 2022
Merged

Bump Ruby to 3.1 #5447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2badf4b
Bump Ruby to 3.1
jeffwidman Jul 29, 2022
a4dc9e6
Drop `debase`, it doesn't yet support Ruby 3.1
jeffwidman Jul 29, 2022
4caa170
`webrick` must be manually installed
jeffwidman Aug 1, 2022
6dbec51
Allow but don't require omitting hash values
jeffwidman Aug 2, 2022
2b7808f
Temp disable freezing/mutable Rubocop checks
jeffwidman Aug 3, 2022
925c43d
debug replaces byebug
jeffwidman Sep 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug-report.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ body:
- type: input
attributes:
label: Language version
description: If applicable, specify the language version you're using (e.g., Node.js `14.1`, Ruby `2.7`, etc.)
description: If applicable, specify the language version you're using (e.g., Node.js `14.1`, Ruby `3.1`, etc.)
validations:
required: false

Expand Down
12 changes: 12 additions & 0 deletions .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,8 @@ Style/HashExcept:
Enabled: true
Style/HashLikeCase:
Enabled: false
Style/HashSyntax:
EnforcedShorthandSyntax: either
Copy link
Copy Markdown
Member Author

@jeffwidman jeffwidman Aug 2, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This allows but doesn't require the new shorthand syntax sugar. The new syntax is a bit controversial... see detailed notes in the relevant commit message.

Copy link
Copy Markdown
Member

@jurre jurre Aug 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah this makes sense to me. I'm not quite sure how I feel about the new syntax, in js/ts I think it's fine so probably just takes a bit of getting used to. Either way I probably would avoid major syntax style changes in this upgrade, and once everything works, re-evaluate on that stuff

Style/HashTransformKeys:
Enabled: false
Style/HashTransformValues:
Expand Down Expand Up @@ -320,3 +322,13 @@ Style/SpecialGlobalVars:
Enabled: false
Style/SelectByRegexp:
Enabled: false

# TODO these were temporarily disabled during the Ruby 2.7 -> 3.1 upgrade
# in order to keep the upgrade diff small, they will be enabled/fixed in
# a follow-on PR.
Naming/BlockForwarding:
Enabled: false
Style/MutableConstant:
Enabled: false
Style/RedundantFreeze:
Enabled: false
Copy link
Copy Markdown
Member Author

@jeffwidman jeffwidman Aug 3, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opened #5468 to re-enable these checks and fix the existing violations.

2 changes: 1 addition & 1 deletion .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.6
3.1.2
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ RUN if ! getent group "$USER_GID"; then groupadd --gid "$USER_GID" dependabot ;

### RUBY

ARG RUBY_VERSION=2.7.6
ARG RUBY_VERSION=3.1.2
ARG RUBY_INSTALL_VERSION=0.8.3

ARG RUBYGEMS_SYSTEM_VERSION=3.3.22
Expand Down
5 changes: 1 addition & 4 deletions common/dependabot-common.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
spec.require_path = "lib"
spec.files = []

spec.required_ruby_version = ">= 2.7.0"
spec.required_ruby_version = ">= 3.1.0"
spec.required_rubygems_version = ">= 3.3.22"

spec.add_dependency "activesupport", ">= 6.0.0"
Expand All @@ -35,8 +35,6 @@ Gem::Specification.new do |spec|
spec.add_dependency "parser", ">= 2.5", "< 4.0"
spec.add_dependency "toml-rb", ">= 1.1.2", "< 3.0"

spec.add_development_dependency "debase", "0.2.3"
spec.add_development_dependency "debase-ruby_core_source", "0.10.17"
spec.add_development_dependency "debug", ">= 1.0.0"
spec.add_development_dependency "gpgme", "~> 2.0"
spec.add_development_dependency "parallel_tests", "~> 3.13.0"
Expand All @@ -45,7 +43,6 @@ Gem::Specification.new do |spec|
spec.add_development_dependency "rspec-its", "~> 1.2"
spec.add_development_dependency "rubocop", "~> 1.36.0"
spec.add_development_dependency "rubocop-performance", "~> 1.15.0"
spec.add_development_dependency "ruby-debug-ide", "~> 0.7.3"
spec.add_development_dependency "simplecov", "~> 0.21.0"
spec.add_development_dependency "simplecov-console", "~> 0.9.1"
spec.add_development_dependency "stackprof", "~> 0.2.16"
Expand Down
6 changes: 3 additions & 3 deletions common/spec/warning_monkey_patch.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# frozen_string_literal: true

ALLOW_PATTERNS = [
# Ignore parser warnings for ruby 2.7 minor version mismatches.
# Ignore `parser/current` warnings for ruby patch version mismatches.
# This is a recurring issue that occurs whenever the parser gets
# ahead of our installed ruby version.
%r{parser/current is loading parser/ruby27},
/2.7.\d-compliant syntax, but you are running 2.7.\d/,
%r{parser/current is loading parser/ruby31},
/3.1.\d-compliant syntax, but you are running 3.1.\d/,
%r{whitequark/parser}
].freeze

Expand Down
2 changes: 1 addition & 1 deletion omnibus/dependabot-omnibus.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
spec.homepage = common_gemspec.homepage
spec.license = common_gemspec.license

spec.required_ruby_version = ">= 2.7.0"
spec.required_ruby_version = ">= 3.1.0"
spec.require_path = "lib"
spec.files = ["lib/dependabot/omnibus.rb"]

Expand Down
2 changes: 2 additions & 0 deletions pub/dependabot-pub.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ Gem::Specification.new do |spec|

spec.add_dependency "dependabot-common", Dependabot::VERSION

spec.add_development_dependency "webrick", ">= 1.7"
Copy link
Copy Markdown
Member Author

@jeffwidman jeffwidman Aug 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

webrick was removed from the ruby 3.0 stdlib, so have to manually add it as a dependency.


common_gemspec.development_dependencies.each do |dep|
spec.add_development_dependency dep.name, dep.requirement.to_s
end
Expand Down
2 changes: 1 addition & 1 deletion updater/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ gem "sentry-raven", "~> 3.1"
gem "terminal-table", "~> 3.0.2"

group :test do
gem "byebug", "~> 11.1"
gem "debug", "~> 1.0.0"
gem "rspec", "~> 3.11"
gem "rubocop", "~> 1.36.0"
gem "rubocop-performance", "~> 1.15.0"
Expand Down
1 change: 0 additions & 1 deletion updater/spec/spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# frozen_string_literal: true

require "byebug"
require "dependabot/logger"
require "dependabot/python"
require "dependabot/terraform"
Expand Down