dep: drop ruby 2.7 support (#3040)

**What problem is this PR intended to solve?** In the upcoming v1.16 release, we'll be adding 3.3 support and dropping 2.7 support. This PR handles the latter. See #2897 **Have you included adequate test coverage?** Existing test coverage has been updated to drop 2.7. **Does this change affect the behavior of either the C or the Java implementations?** N/A
sparklemotion · Nov 28, 2023 · 5af69a3 · 5af69a3
2 parents e587fae + cc788e3
commit 5af69a3
Show file tree

Hide file tree

Showing 20 changed files with 31 additions and 352 deletions.
diff --git a/.cross_rubies b/.cross_rubies
@@ -1,11 +1,3 @@
-2.7.0:aarch64-linux
-2.7.0:arm-linux
-2.7.0:arm64-darwin
-2.7.0:x64-mingw32
-2.7.0:x86-linux
-2.7.0:x86-mingw32
-2.7.0:x86_64-darwin
-2.7.0:x86_64-linux
 3.0.0:aarch64-linux
 3.0.0:arm-linux
 3.0.0:arm64-darwin

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,7 +37,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image: ["ubuntu", "ubuntu32"]
+        image: ["ubuntu"]
         sys: ["enable"]
     runs-on: ubuntu-latest
     container:
@@ -98,7 +98,7 @@ jobs:
       fail-fast: false
       matrix:
         sys: ["enable", "disable"]
-        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3-rc"]
+        ruby: ["3.0", "3.1", "3.2", "3.3-rc"]
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/sparklemotion/nokogiri-test:mri-${{matrix.ruby}}
@@ -238,7 +238,7 @@ jobs:
       fail-fast: false
       matrix:
         sys: ["enable", "disable"]
-        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3.0-preview3"]
+        ruby: ["3.0", "3.1", "3.2", "3.3.0-preview3"]
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
@@ -263,7 +263,7 @@ jobs:
       fail-fast: false
       matrix:
         sys: ["enable", "disable"]
-        ruby: ["2.7", "3.0", "3.1", "3.2", "head", "mingw"]
+        ruby: ["3.0", "3.1", "3.2", "head", "mingw"]
     runs-on: windows-2022
     steps:
       - name: configure git crlf
@@ -431,7 +431,7 @@ jobs:
       fail-fast: false
       matrix:
         sys: ["enable", "disable"]
-        ruby: ["2.7", "3.0", "3.1", "3.2", "head"]
+        ruby: ["3.0", "3.1", "3.2", "head"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -453,7 +453,7 @@ jobs:
       fail-fast: false
       matrix:
         sys: ["enable", "disable"]
-        ruby: ["2.7", "3.0", "3.1", "3.2", "head"]
+        ruby: ["3.0", "3.1", "3.2", "head"]
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
@@ -474,7 +474,7 @@ jobs:
       fail-fast: false
       matrix:
         sys: ["enable", "disable"]
-        ruby: ["2.7", "3.0"]
+        ruby: ["3.0"]
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
@@ -556,7 +556,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3.0-preview3"]
+        ruby: ["3.0", "3.1", "3.2", "3.3.0-preview3"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -578,7 +578,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3.0-preview3"]
+        ruby: ["3.0", "3.1", "3.2", "3.3.0-preview3"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -600,7 +600,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3.0-preview3"]
+        ruby: ["3.0", "3.1", "3.2", "3.3.0-preview3"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -622,7 +622,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.7", "3.0", "3.1", "3.2", "head"]
+        ruby: ["3.0", "3.1", "3.2", "head"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -659,7 +659,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.7", "3.0", "3.1", "3.2", "head"]
+        ruby: ["3.0", "3.1", "3.2", "head"]
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
@@ -679,7 +679,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.7", "3.0"]
+        ruby: ["3.0"]
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/generate-ci-images.yml b/.github/workflows/generate-ci-images.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        tag: ["alpine", "mri-2.7", "mri-3.0", "mri-3.1", "mri-3.2", "mri-3.3-rc", "truffle-nightly", "ubuntu", "ubuntu32"]
+        tag: ["alpine", "mri-3.0", "mri-3.1", "mri-3.2", "mri-3.3-rc", "truffle-nightly", "ubuntu"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -14,7 +14,7 @@ AllCops:
     - 'lib/nokogiri/css/tokenizer.rb' # generated by rex
     - 'lib/nokogiri/jruby/nokogiri_jars.rb' # generated by jar-dependencies
     - 'test/_test_pattern_matching.rb' # until TargetRubyVersion >= 3.0
-  TargetRubyVersion: "2.7"
+  TargetRubyVersion: "3.0"
 
 Metrics/BlockNesting:
   Exclude:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,13 @@ Nokogiri follows [Semantic Versioning](https://semver.org/), please see the [REA
 
 ## next / unreleased
 
+#### Ruby
+
+This release introduces native gem support for Ruby 3.3.
+
+This release ends support for Ruby 2.7, for which [upstream support ended 2023-03-31](https://www.ruby-lang.org/en/downloads/branches/).
+
+
 ### Notable Changes
 
 #### Pattern matching

diff --git a/README.md b/README.md
@@ -111,7 +111,7 @@ You can help sponsor the maintainers of this software through one of these organ
 
 Requirements:
 
-- Ruby >= 2.7
+- Ruby >= 3.0
 - JRuby >= 9.4.0.0
 
 

diff --git a/Vagrantfile b/Vagrantfile
diff --git a/appveyor.yml b/appveyor.yml
@@ -40,8 +40,8 @@ environment:
       INSTALL_PACKAGES: "mingw-w64-i686-libxslt mingw-w64-i686-libyaml"
       EXTCONF_PARAMS: "--use-system-libraries"
 
-    - ruby_version: 27
+    - ruby_version: 30
       INSTALL_PACKAGES: "mingw-w64-i686-libyaml"
-    - ruby_version: 27
+    - ruby_version: 30
       INSTALL_PACKAGES: "mingw-w64-i686-libxslt mingw-w64-i686-libyaml"
       EXTCONF_PARAMS: "--use-system-libraries"
diff --git a/ext/nokogiri/extconf.rb b/ext/nokogiri/extconf.rb
@@ -1088,7 +1088,6 @@ def compile
 have_func("xmlRelaxNGSetValidStructuredErrors") # introduced in libxml 2.6.21
 have_func("xmlSchemaSetValidStructuredErrors") # introduced in libxml 2.6.23
 have_func("xmlSchemaSetParserStructuredErrors") # introduced in libxml 2.6.23
-have_func("rb_gc_location") # introduced in Ruby 2.7
 have_func("rb_category_warning") # introduced in Ruby 3.0
 
 other_library_versions_string = OTHER_LIBRARY_VERSIONS.map { |k, v| [k, v].join(":") }.join(",")

diff --git a/ext/nokogiri/xml_namespace.c b/ext/nokogiri/xml_namespace.c
@@ -42,7 +42,6 @@ _xml_namespace_dealloc(void *ptr)
   xmlFree(ns);
 }
 
-#ifdef HAVE_RB_GC_LOCATION
 static void
 _xml_namespace_update_references(void *ptr)
 {
@@ -51,9 +50,6 @@ _xml_namespace_update_references(void *ptr)
     ns->_private = (void *)rb_gc_location((VALUE)ns->_private);
   }
 }
-#else
-#  define _xml_namespace_update_references 0
-#endif
 
 static const rb_data_type_t nokogiri_xml_namespace_type_with_dealloc = {
   .wrap_struct_name = "Nokogiri::XML::Namespace#with_dealloc",

diff --git a/ext/nokogiri/xml_node.c b/ext/nokogiri/xml_node.c
@@ -28,7 +28,6 @@ _xml_node_mark(void *ptr)
   }
 }
 
-#ifdef HAVE_RB_GC_LOCATION
 static void
 _xml_node_update_references(void *ptr)
 {
@@ -38,9 +37,6 @@ _xml_node_update_references(void *ptr)
     node->_private = (void *)rb_gc_location((VALUE)node->_private);
   }
 }
-#else
-#  define _xml_node_update_references 0
-#endif
 
 static const rb_data_type_t nokogiri_node_type = {
   .wrap_struct_name = "Nokogiri::XML::Node",

diff --git a/nokogiri.gemspec b/nokogiri.gemspec
@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
 
   spec.license = "MIT"
 
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 3.0.0"
 
   spec.homepage = "https://nokogiri.org"
   spec.metadata = {

diff --git a/oci-images/nokogiri-test/mri-2.7.dockerfile b/oci-images/nokogiri-test/mri-2.7.dockerfile
diff --git a/oci-images/nokogiri-test/ubuntu.dockerfile b/oci-images/nokogiri-test/ubuntu.dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal
+FROM ubuntu:jammy
 
 # include_file debian-prelude.step
 # -*- dockerfile -*-

diff --git a/oci-images/nokogiri-test/ubuntu.erb b/oci-images/nokogiri-test/ubuntu.erb
@@ -1,4 +1,4 @@
-FROM ubuntu:focal
+FROM ubuntu:jammy
 
 <%= include_file "debian-prelude.step" %>