Merge branch 'master' into add_percent_func

Public-Health-Scotland · Feb 10, 2025 · 575d2ea · 575d2ea
2 parents 251af9e + d816bed
commit 575d2ea
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 28 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -35,11 +35,9 @@ jobs:
           - {os: ubuntu-latest, r: 'oldrel-2', must_pass: false}
 
           # An approximation for the PHS RStudio Desktop installation
-          - {os: windows-latest,  r: '3.6.1', must_pass: true}
           - {os: windows-latest,  r: '4.0.1', must_pass: true}
 
           # An approximation of the PHS RStudio setup on Posit Workbench
-          - {os: ubuntu-latest,   r: '3.6.1', must_pass: true}
           - {os: ubuntu-latest,   r: '4.0.2', must_pass: true}
           - {os: ubuntu-latest,   r: '4.1.2', must_pass: true}
 

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -28,7 +28,7 @@ URL: https://github.com/Public-Health-Scotland/phsmethods,
     https://public-health-scotland.github.io/phsmethods/
 BugReports: https://github.com/Public-Health-Scotland/phsmethods/issues
 Depends:
-    R (>= 2.10)
+    R (>= 3.6)
 Imports:
     cli,
     dplyr,

diff --git a/R/make_inheritance_checks.R b/R/make_inheritance_checks.R
@@ -6,7 +6,8 @@
 #' @param target_classes character vector of the classes to check for.
 #' @param ignore_null boolean. Indicates whether to ignore arguments with value
 #' NULL (TRUE) or to throw an exception (FALSE). Default = TRUE.
-
+#' @keywords internal
+#' @noRd
 make_inheritance_checks <- function(arguments,
                                     target_classes,
                                     ignore_null = TRUE) {

diff --git a/man/make_inheritance_checks.Rd b/man/make_inheritance_checks.Rd