From 0f565db6296b85cb6c8f06f2fc55a44b3391df1d Mon Sep 17 00:00:00 2001 From: "Lydia Gibson, MS, GStat" Date: Mon, 19 Aug 2024 08:30:01 -0700 Subject: [PATCH] Remove code needed for old R versions (#2759) --- R/rd.R | 10 +--------- tests/testthat/test-build-home-license.R | 2 -- tests/testthat/test-build-reference.R | 1 - tests/testthat/test-rd-html.R | 3 --- 4 files changed, 1 insertion(+), 15 deletions(-) diff --git a/R/rd.R b/R/rd.R index 91d03c1c0..c659761dd 100644 --- a/R/rd.R +++ b/R/rd.R @@ -6,15 +6,7 @@ rd_text <- function(x, fragment = TRUE) { } rd_file <- function(path, pkg_path = NULL) { - if (getRversion() >= "3.4.0") { - macros <- tools::loadPkgRdMacros(pkg_path) - set_classes(tools::parse_Rd(path, macros = macros, encoding = "UTF-8")) - } else if (getRversion() >= "3.2.0") { - macros <- tools::loadPkgRdMacros(pkg_path, TRUE) - set_classes(tools::parse_Rd(path, macros = macros, encoding = "UTF-8")) - } else { - set_classes(tools::parse_Rd(path, encoding = "UTF-8")) - } + set_classes(tools::parse_Rd(path, encoding = "UTF-8")) } #' Translate an Rd string to its HTML output diff --git a/tests/testthat/test-build-home-license.R b/tests/testthat/test-build-home-license.R index 5470e8179..285037043 100644 --- a/tests/testthat/test-build-home-license.R +++ b/tests/testthat/test-build-home-license.R @@ -1,6 +1,4 @@ test_that("link_license matchs exactly", { - # R 3.1 uses http url - skip_if_not(getRversion() >= "3.2.0") # Shouldn't match first GPL-2 expect_equal( diff --git a/tests/testthat/test-build-reference.R b/tests/testthat/test-build-reference.R index 848e477e0..9e66d796f 100644 --- a/tests/testthat/test-build-reference.R +++ b/tests/testthat/test-build-reference.R @@ -1,5 +1,4 @@ test_that("parse failures include file name", { - skip_if_not(getRversion() >= "4.0.0") pkg <- local_pkgdown_site(test_path("assets/reference-fail")) expect_snapshot(build_reference(pkg), error = TRUE) }) diff --git a/tests/testthat/test-rd-html.R b/tests/testthat/test-rd-html.R index 4aeed412f..c76b7288d 100644 --- a/tests/testthat/test-rd-html.R +++ b/tests/testthat/test-rd-html.R @@ -428,9 +428,6 @@ test_that("deqn", { }) test_that("special", { - # Fails due to a bug prior to R 4.0.0: - # https://bugs.r-project.org/show_bug.cgi?id=17727 - skip_if_not(getRversion() >= "4.0.0") out <- rd2html("\\special{( \\dots )}") expect_equal(out, "( ... )") })