Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix roxygen issues #35

Merged
merged 1 commit into from
Mar 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Type: Package
Package: anndata
Title: 'anndata' for R
Version: 0.7.5.6
Authors@R:
Authors@R:
c(person(given = "Philipp",
family = "Angerer",
role = "ccp",
Expand Down Expand Up @@ -47,7 +47,7 @@ Suggests:
rmarkdown
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.3.2
RoxygenNote: 7.3.2.9000
Config/reticulate:
list(
packages = list(
Expand Down
2 changes: 1 addition & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ S3method(py_to_r,anndata._core.aligned_mapping.LayersBase)
S3method(py_to_r,anndata._core.anndata.AnnData)
S3method(py_to_r,anndata._core.raw.Raw)
S3method(py_to_r,anndata._core.sparse_dataset.SparseDataset)
S3method(py_to_r,anndata.abc._AbstractCSDataset)
S3method(py_to_r,collections.abc.KeysView)
S3method(py_to_r,collections.abc.Mapping)
S3method(py_to_r,collections.abc.Set)
Expand Down Expand Up @@ -58,7 +59,6 @@ export(write_csvs)
export(write_h5ad)
export(write_loom)
export(write_zarr)
importFrom(Matrix,sparseMatrix)
importFrom(R6,R6Class)
importFrom(assertthat,assert_that)
importFrom(methods,as)
Expand Down
2 changes: 1 addition & 1 deletion R/concat.R
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#' @param uns_merge How the elements of `.uns` are selected. Uses the same set of strategies as the `merge` argument, except applied recursively.
#' @param label Column in axis annotation (i.e. `.obs` or `.var`) to place batch information in. If it's NULL, no column is added.
#' @param keys Names for each object being added. These values are used for column values for `label` or appended to the index if `index_unique` is not `NULL`. Defaults to incrementing integer labels.
#' @param index_unique Whether to make the index unique by using the keys. If provided, this is the delimeter between "{orig_idx}{index_unique}{key}". When `NULL`, the original indices are kept.
#' @param index_unique Whether to make the index unique by using the keys. If provided, this is the delimeter between `{orig_idx}{index_unique}{key}`. When `NULL`, the original indices are kept.
#' @param fill_value When `join="outer"`, this is the value that will be used to fill the introduced indices. By default, sparse arrays are padded with zeros, while dense arrays and DataFrames are padded with missing values.
#' @param pairwise Whether pairwise elements along the concatenated dimension should be included. This is FALSE by default, since the resulting arrays are often not meaningful.
#'
Expand Down
12 changes: 1 addition & 11 deletions R/reticulate_conversions.R
Original file line number Diff line number Diff line change
Expand Up @@ -89,17 +89,7 @@ py_to_r.collections.abc.KeysView <- function(x) {
x_list
}


#' @importFrom Matrix sparseMatrix
py_to_r.scipy.sparse.csc.csc_matrix <- function(x) {
Matrix::sparseMatrix(
i = as.integer(py_to_r_ifneedbe(x$indices)) + 1,
p = as.integer(py_to_r_ifneedbe(x$indptr)),
x = as.vector(py_to_r_ifneedbe(x$data)),
dims = as.integer(dim(x))
)
}

#' @export
py_to_r.anndata.abc._AbstractCSDataset <- function(x) {
py_to_r_ifneedbe(x$to_memory())
}
Expand Down
2 changes: 1 addition & 1 deletion man/concat.Rd

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

Loading