From d16d8291fe2b8b5125f31b8521af8a9ec2c88496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Sat, 27 Apr 2019 09:03:04 +0200 Subject: [PATCH] Drop ruby 2.3 support (#554) --- .circleci/config.yml | 37 ------------------------------------- .rubocop.yml | 2 +- CHANGELOG.md | 4 ++++ README.md | 2 +- appveyor.yml | 1 - byebug.gemspec | 2 +- docker/manager.rb | 1 - lib/byebug/commands/set.rb | 2 +- lib/byebug/setting.rb | 2 +- test/commands/where_test.rb | 2 +- test/minitest_runner.rb | 2 +- 11 files changed, 11 insertions(+), 46 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f0a4b9306..fcccdd8d1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -146,38 +146,6 @@ workflows: test: jobs: - - spec: - name: 2.3-readline-gcc - executor: - name: test - version: 2.3.8 - line_editor: readline - compiler: gcc - - - spec: - name: 2.3-libedit-gcc - executor: - name: test - version: 2.3.8 - line_editor: libedit - compiler: gcc - - - spec: - name: 2.3-readline-clang - executor: - name: test - version: 2.3.8 - line_editor: readline - compiler: clang - - - spec: - name: 2.3-libedit-clang - executor: - name: test - version: 2.3.8 - line_editor: libedit - compiler: clang - - spec: name: 2.4-readline-gcc executor: @@ -308,11 +276,6 @@ workflows: - upload_coverage: requires: - - 2.3-readline-gcc - - 2.3-libedit-gcc - - 2.3-readline-clang - - 2.3-libedit-clang - - 2.4-readline-gcc - 2.4-libedit-gcc - 2.4-readline-clang diff --git a/.rubocop.yml b/.rubocop.yml index 3c87969aa..5e55b609f 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -7,7 +7,7 @@ AllCops: DisplayCopNames: true DisplayStyleGuide: true - TargetRubyVersion: 2.3 + TargetRubyVersion: 2.4 Layout/ExtraSpacing: AllowForAlignment: false diff --git a/CHANGELOG.md b/CHANGELOG.md index 2387e3727..745a16c36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## [Unreleased] +### Removed + +* Support for MRI 2.3. Byebug no longer installs on this platform. + ## [11.0.1] - 2019-03-18 ### Fixed diff --git a/README.md b/README.md index 4d5a977ca..c89d4f60e 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Windows [![Vey][vey]][vey_url] ## Requirements -MRI 2.3.0 or higher. +MRI 2.4.0 or higher. ## Install diff --git a/appveyor.yml b/appveyor.yml index 6734f70d0..13872f177 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -38,7 +38,6 @@ test_script: environment: matrix: - - ruby_version: 23-x64 - ruby_version: 24-x64 - ruby_version: 25-x64 - ruby_version: 26-x64 diff --git a/byebug.gemspec b/byebug.gemspec index 0c74cedfe..1ed1a1e7e 100644 --- a/byebug.gemspec +++ b/byebug.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| can build on. It provides breakpoint handling and bindings for stack frames among other things and it comes with an easy to use command line interface." - s.required_ruby_version = ">= 2.3.0" + s.required_ruby_version = ">= 2.4.0" s.files = Dir["lib/**/*.rb", "lib/**/*.yml", "ext/**/*.[ch]", "LICENSE"] s.bindir = "exe" diff --git a/docker/manager.rb b/docker/manager.rb index 0fffba61b..592f781a4 100644 --- a/docker/manager.rb +++ b/docker/manager.rb @@ -10,7 +10,6 @@ module Docker # class Manager VERSIONS = %w[ - 2.3.8 2.4.5 2.5.5 2.6.2 diff --git a/lib/byebug/commands/set.rb b/lib/byebug/commands/set.rb index 18dfa175e..ccaade3be 100644 --- a/lib/byebug/commands/set.rb +++ b/lib/byebug/commands/set.rb @@ -50,7 +50,7 @@ def execute if !setting.boolean? && value.nil? err = pr("set.errors.must_specify_value", key: key) elsif setting.boolean? - value, err = get_onoff(value, key =~ /^no/ ? false : true) + value, err = get_onoff(value, /^no/.match?(key) ? false : true) elsif setting.integer? value, err = get_int(value, setting.to_sym, 1) end diff --git a/lib/byebug/setting.rb b/lib/byebug/setting.rb index d681004b5..25c6c9e49 100644 --- a/lib/byebug/setting.rb +++ b/lib/byebug/setting.rb @@ -52,7 +52,7 @@ def []=(name, value) end def find(shortcut) - abbr = shortcut =~ /^no/ ? shortcut[2..-1] : shortcut + abbr = /^no/.match?(shortcut) ? shortcut[2..-1] : shortcut matches = settings.select do |key, value| key =~ (value.boolean? ? /#{abbr}/ : /#{shortcut}/) end diff --git a/test/commands/where_test.rb b/test/commands/where_test.rb index 982eb8316..2ee594e47 100644 --- a/test/commands/where_test.rb +++ b/test/commands/where_test.rb @@ -120,7 +120,7 @@ def test_where_displays_instance_exec_block_frames # are usually very deeply nested and on OS X where tmp path is always # deeply nested. # - unless /cygwin|mswin|mingw|darwin/ =~ RUBY_PLATFORM + unless /cygwin|mswin|mingw|darwin/.match?(RUBY_PLATFORM) class WhereWithNotDeeplyNestedPathsTest < WhereStandardTest def test_where_displays_current_backtrace_w_shorpaths_if_fullpath_disabled enter "set nofullpath", "where", "set fullpath" diff --git a/test/minitest_runner.rb b/test/minitest_runner.rb index f42f6ebaf..35edb39ff 100644 --- a/test/minitest_runner.rb +++ b/test/minitest_runner.rb @@ -48,7 +48,7 @@ def test_suites end def test_methods(str) - if str =~ /test_.*/ + if /test_.*/.match?(str) filter_runnables_by_method(str) else filter_runnables_by_class(str)