Skip to content

Commit 67b028b

Browse files
committed
Add R6 dependency
1 parent e36f9db commit 67b028b

4 files changed

Lines changed: 4 additions & 5 deletions

File tree

RcppTskit/DESCRIPTION

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,9 @@ Description: Tskit enables performant storage, manipulation, and analysis
2121
and the `reticulate` approach.
2222
URL: https://github.com/highlanderlab/RcppTskit
2323
License: MIT + file LICENSE
24-
Imports: methods, Rcpp (>= 1.1.0), Rdpack, reticulate
24+
Imports: methods, R6, Rcpp (>= 1.1.0), reticulate
2525
LinkingTo: Rcpp
2626
Suggests: covr, spelling, testthat
27-
RdMacros: Rdpack
2827
RoxygenNote: 7.3.3
2928
Encoding: UTF-8
3029
Language: en-GB

RcppTskit/NAMESPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ export(ts_summary_ptr)
2828
export(ts_time_units_ptr)
2929
export(ts_write_ptr)
3030
export(tskit_version)
31+
importFrom(R6,R6Class)
3132
importFrom(Rcpp,cppFunction)
3233
importFrom(Rcpp,registerPlugin)
33-
importFrom(Rdpack,reprompt)
3434
importFrom(methods,is)
3535
importFrom(reticulate,import)
3636
importFrom(reticulate,is_py_object)

RcppTskit/R/Class-TreeSequence.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#' The pointer does not provide direct view for users and currently there is
66
#' only a limited number of methods available to summarise the tree sequence.
77
#' @export
8-
TreeSequence <- R6::R6Class(
8+
TreeSequence <- R6Class(
99
classname = "TreeSequence",
1010
public = list(
1111
#' @field pointer external pointer to the tree sequence

RcppTskit/R/RcppTskit-package.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
#'
1515
#' @useDynLib RcppTskit, .registration = TRUE
1616
#' @importFrom methods is
17+
#' @importFrom R6 R6Class
1718
#' @importFrom Rcpp registerPlugin cppFunction
1819
#' @importFrom reticulate is_py_object import py_module_available py_require
19-
#' @importFrom Rdpack reprompt
2020
#'
2121
#' @examples
2222
#' \dontshow{# Providing the examples here so we test them via R CMD check}

0 commit comments

Comments
 (0)