Merge pull request #17 from swarm-lab/develop

Develop
swarm-lab · Mar 26, 2023 · 7b787b5 · 7b787b5
2 parents 493e707 + 59f6eeb
commit 7b787b5
Show file tree

Hide file tree

Showing 28 changed files with 92 additions and 80 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: trackdf
 Type: Package
 Title: Data Frame Class for Tracking Data
-Version: 0.3.1
-Date: 2023-01-22
+Version: 0.3.2
+Date: 2023-03-25
 Authors@R: c(
     person("Simon", "Garnier", email = "[email protected]", role = c("aut", "cre"),
       comment = c(ORCID = "0000-0002-3886-3974"))

diff --git a/NAMESPACE b/NAMESPACE
@@ -29,11 +29,10 @@ S3method(print,track)
 S3method(rename,track)
 S3method(right_join,track)
 S3method(rowwise,track)
-S3method(sample_frac,track)
-S3method(sample_n,track)
 S3method(select,track)
 S3method(semi_join,track)
 S3method(slice,track)
+S3method(slice_sample,track)
 S3method(summarise,track)
 S3method(summarize,track)
 S3method(transmute,track)
@@ -74,11 +73,10 @@ importFrom(dplyr,nest_join)
 importFrom(dplyr,rename)
 importFrom(dplyr,right_join)
 importFrom(dplyr,rowwise)
-importFrom(dplyr,sample_frac)
-importFrom(dplyr,sample_n)
 importFrom(dplyr,select)
 importFrom(dplyr,semi_join)
 importFrom(dplyr,slice)
+importFrom(dplyr,slice_sample)
 importFrom(dplyr,summarise)
 importFrom(dplyr,summarize)
 importFrom(dplyr,transmute)

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,15 @@
+# trackdf 0.3.2
+
+## New features
+
+* N/A.
+
+## Minor improvements and fixes
+
+* Fixes CRAN check warnings with R-devel. 
+
+---
+
 # trackdf 0.3.1
 
 ## New features

diff --git a/R/tidyverse.R b/R/tidyverse.R
@@ -49,7 +49,7 @@
 #'
 #' @description \code{\link[dplyr]{dplyr}} methods for track tables objects.
 #'
-#' @param .data A track table.
+#' @param data,.data,x A track table.
 #'
 #' @param ... Additional arguments to be passed to the corresponding
 #'  \code{\link[dplyr]{dplyr}} method.
@@ -125,19 +125,13 @@ group_by.track <- function(.data, ...) .reclass(.data, NextMethod())
 #' @rdname dplyr_track
 #'
 #' @export
-ungroup.track <- function(.data, ...) .reclass(.data, NextMethod())
+ungroup.track <- function(x, ...) .reclass(x, NextMethod())
 
-#' @importFrom dplyr sample_n
+#' @importFrom dplyr slice_sample
 #' @rdname dplyr_track
 #'
 #' @export
-sample_n.track <- function(.data, ...) .reclass(.data, NextMethod())
-
-#' @importFrom dplyr sample_frac
-#' @rdname dplyr_track
-#'
-#' @export
-sample_frac.track <- function(.data, ...) .reclass(.data, NextMethod())
+slice_sample.track <- function(.data, ...) .reclass(.data, NextMethod())
 
 #' @importFrom dplyr do
 #' @rdname dplyr_track
@@ -155,43 +149,43 @@ slice.track <- function(.data, ...) .reclass(.data, NextMethod())
 #' @rdname dplyr_track
 #'
 #' @export
-semi_join.track <- function(.data, ...) .reclass(.data, NextMethod())
+semi_join.track <- function(x, ...) .reclass(x, NextMethod())
 
 #' @importFrom dplyr anti_join
 #' @rdname dplyr_track
 #'
 #' @export
-anti_join.track <- function(.data, ...) .reclass(.data, NextMethod())
+anti_join.track <- function(x, ...) .reclass(x, NextMethod())
 
 #' @importFrom dplyr inner_join
 #' @rdname dplyr_track
 #'
 #' @export
-inner_join.track <- function(.data, ...) .reclass(.data, NextMethod())
+inner_join.track <- function(x, ...) .reclass(x, NextMethod())
 
 #' @importFrom dplyr left_join
 #' @rdname dplyr_track
 #'
 #' @export
-left_join.track <- function(.data, ...) .reclass(.data, NextMethod())
+left_join.track <- function(x, ...) .reclass(x, NextMethod())
 
 #' @importFrom dplyr right_join
 #' @rdname dplyr_track
 #'
 #' @export
-right_join.track <- function(.data, ...) .reclass(.data, NextMethod())
+right_join.track <- function(x, ...) .reclass(x, NextMethod())
 
 #' @importFrom dplyr full_join
 #' @rdname dplyr_track
 #'
 #' @export
-full_join.track <- function(.data, ...) .reclass(.data, NextMethod())
+full_join.track <- function(x, ...) .reclass(x, NextMethod())
 
 #' @importFrom dplyr nest_join
 #' @rdname dplyr_track
 #'
 #' @export
-nest_join.track <- function(.data, ...) .reclass(.data, NextMethod())
+nest_join.track <- function(x, ...) .reclass(x, NextMethod())
 
 #' @importFrom dplyr distinct
 #' @rdname dplyr_track
@@ -203,4 +197,4 @@ distinct.track <- function(.data, ...) .reclass(.data, NextMethod())
 #' @rdname dplyr_track
 #'
 #' @export
-rowwise.track <- function(.data, ...) .reclass(.data, NextMethod())
+rowwise.track <- function(data, ...) .reclass(data, NextMethod())
diff --git a/cran-comments.md b/cran-comments.md
@@ -1,8 +1,8 @@
 ## Test environments
 
-* local OS X 13.1, R 4.2.2 + devel
-* local Windows 10, R 4.2.2 + devel
-* local Ubuntu 22.04, R 4.2.2 + devel
+* local OS X 13.1, R 4.2.3 + devel
+* local Windows 10, R 4.2.3 + devel
+* local Ubuntu 22.04, R 4.2.3 + devel
 * Github Actions "windows-latest (release)"
 * Github Actions "macOS-latest (release)"
 * Github Actions "ubuntu-22.04-latest (release)"

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/articles/z1_install.html b/docs/articles/z1_install.html
diff --git a/docs/articles/z2_build.html b/docs/articles/z2_build.html
diff --git a/docs/articles/z3_manipulate.html b/docs/articles/z3_manipulate.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -1,12 +1,12 @@
-pandoc: 2.19.2
+pandoc: 3.1.1
 pkgdown: 2.0.7
 pkgdown_sha: ~
 articles:
   z1_install: z1_install.html
   z2_build: z2_build.html
   z3_manipulate: z3_manipulate.html
   z4_errors: z4_errors.html
-last_built: 2023-01-23T00:10Z
+last_built: 2023-03-25T20:59Z
 urls:
   reference: https://swarm-lab.github.io/trackdf/reference
   article: https://swarm-lab.github.io/trackdf/articles

diff --git a/docs/reference/conversions.html b/docs/reference/conversions.html