Skip to content

Commit

Permalink
Merge pull request #86 from molgenis/fix/cran
Browse files Browse the repository at this point in the history
fix: cran
  • Loading branch information
timcadman authored Jul 5, 2024
2 parents 86f6057 + 2083165 commit 453dd03
Show file tree
Hide file tree
Showing 13 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: DSMolgenisArmadillo
Type: Package
Version: 2.0.8
Version: 2.0.9
Title: 'DataSHIELD' Client for 'MOLGENIS Armadillo'
Description: 'DataSHIELD' is an infrastructure and series of R packages that
enables the remote and 'non-disclosive' analysis of sensitive research data.
Expand Down
12 changes: 6 additions & 6 deletions R/ArmadilloConnection.R
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ setOldClass("handle")
#' Class ArmadilloConnection.
#'
#' An Armadillo connection implementing the DataSHIELD Interface (DSI)
#' \code{\link{DSConnection-class}}.
#' \code{\link[DSI]{DSConnection-class}}.
#'
#' @slot name The name of the connection
#' @slot handle The handle used to connect with the server
Expand Down Expand Up @@ -39,7 +39,7 @@ methods::setClass("ArmadilloConnection",
#' character string).
#'
#' @importMethodsFrom DSI dsDisconnect
#' @seealso \code{\link{dsDisconnect}}
#' @seealso \code{\link[DSI]{dsDisconnect}}
#' @export
methods::setMethod(
"dsDisconnect", "ArmadilloConnection",
Expand Down Expand Up @@ -86,7 +86,7 @@ methods::setMethod(
#'
#' @return The fully qualified names of the tables.
#'
#' @seealso \code{\link{dsListTables}}
#' @seealso \code{\link[DSI]{dsListTables}}
#' @importMethodsFrom DSI dsListTables
#' @export
methods::setMethod(
Expand Down Expand Up @@ -134,7 +134,7 @@ methods::setMethod(
#'
#' @return The fully qualified names of the resources.
#'
#' @seealso \code{\link{dsListResources}}
#' @seealso \code{\link[DSI]{dsListResources}}
#' @importMethodsFrom DSI dsListResources
#' @export
methods::setMethod(
Expand Down Expand Up @@ -176,7 +176,7 @@ methods::setMethod(
#' List of DataSHIELD operations on which Armadillo DataSHIELD Service supports
#' asynchronicity.
#'
#' When a \code{\link{DSResult-class}} object is returned on aggregation or
#' When a \code{\link[DSI]{DSResult-class}} object is returned on aggregation or
#' assignment operation, the raw result can be accessed asynchronously,
#' allowing parallelization of DataSHIELD calls over multpile servers.
#' The returned named list of logicals will specify if asynchronicity is
Expand Down Expand Up @@ -300,7 +300,7 @@ methods::setMethod(
#'
#' Assign a resource in the DataSHIELD R session.
#'
#' @param conn An object that inherits from \code{\link{DSConnection-class}}.
#' @param conn An object that inherits from \code{\link[DSI]{DSConnection-class}}.
#' @param symbol Name of the R symbol.
#' @param resource Fully qualified name of a resource reference in the data
#' repository.
Expand Down
2 changes: 1 addition & 1 deletion R/ArmadilloDriver.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#' Class ArmadilloDriver with constructor armadillo
#'
#' An Armadillo DataSHIELD Service Driver implementing the DataSHIELD Interface
#' (DSI) \code{\link{DSDriver-class}}. This class should always be initialized
#' (DSI) \code{\link[DSI]{DSDriver-class}}. This class should always be initialized
#' with the \code{\link{armadillo}} function.
#' It returns a singleton that allows you to connect to Armadillo
#'
Expand Down
2 changes: 1 addition & 1 deletion R/ArmadilloResult.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ NULL
#' Class ArmadilloResult.
#'
#' An Armadillo result implementing the DataSHIELD Interface (DSI)
#' \code{\link{DSResult-class}}.
#' \code{\link[DSI]{DSResult-class}}.
#'
#' @slot conn The connection used to create this result
#' @slot rval The result
Expand Down
2 changes: 1 addition & 1 deletion cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## 2.0.8
## 2.0.9
* fix: align error handling with opal
* fix: datashield.pkg_status, datashield.methods and datashield.workspaces now return same format as opal

Expand Down
2 changes: 1 addition & 1 deletion man/ArmadilloConnection-class.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/ArmadilloDriver-class.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/ArmadilloResult-class.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/dsAssignResource-ArmadilloConnection-method.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/dsDisconnect-ArmadilloConnection-method.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/dsIsAsync-ArmadilloConnection-method.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/dsListResources-ArmadilloConnection-method.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/dsListTables-ArmadilloConnection-method.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 453dd03

Please sign in to comment.