Skip to content
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
3 changes: 2 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

- Bump required R version to 4.5 in preparation for Bioconductor submission
(PR #309)
- Remove deprecated functions and arguments (PR #311)
- Remove deprecated functions and arguments (PR #311, PR #313)
- Minor cleanups and improvements (PR #313).

# anndataR 0.2.0

Expand Down
17 changes: 0 additions & 17 deletions R/AbstractAnnData.R
Original file line number Diff line number Diff line change
Expand Up @@ -272,23 +272,6 @@ AbstractAnnData <- R6::R6Class(
)
},
#' @description
#' `r lifecycle::badge('deprecated')`
#'
#' Deprecated, use `as_HDF5AnnData()` instead
#'
#' @param ... Arguments passed to `adata$as_HDF5AnnData()`
#'
#' @return An [`HDF5AnnData`] object
to_HDF5AnnData = function(...) {
lifecycle::deprecate_warn(
"0.1.0",
"to_HDF5AnnDAta()",
"as_HDF5AnnData()",
)

self$as_HDF5AnnData(...)
},
#' @description
#' Write the `AnnData` object to an H5AD file
#'
#' See [write_h5ad()] for details
Expand Down
5 changes: 0 additions & 5 deletions R/generate_dataset.R
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@
#'
#' @examples
#' dummy <- generate_dataset()
#' \dontrun{
#' dummy <- generate_dataset(format = "AnnData")
#' dummy <- generate_dataset(format = "SingleCellExperiment")
#' dummy <- generate_dataset(format = "Seurat")
#' }
generate_dataset <- function(
n_obs = 10L,
n_vars = 20L,
Expand Down
23 changes: 0 additions & 23 deletions man/AbstractAnnData.Rd

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

1 change: 0 additions & 1 deletion man/HDF5AnnData.Rd

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

1 change: 0 additions & 1 deletion man/InMemoryAnnData.Rd

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

5 changes: 0 additions & 5 deletions man/generate_dataset.Rd

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

3 changes: 2 additions & 1 deletion tests/testthat/helper-expect_equal_py.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ expect_equal_py <- function(a, b) {

bi <- reticulate::import_builtins()

testthat::expect_equal(bi$str(bi$type(a)), bi$str(bi$type(b))) # does this always work?
# ↓ does this always work?
testthat::expect_equal(bi$str(bi$type(a)), bi$str(bi$type(b)))

if (inherits(a, "pandas.core.frame.DataFrame")) {
pd <- reticulate::import("pandas")
Expand Down
1 change: 0 additions & 1 deletion tests/testthat/test-roundtrip-X.R
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ for (name in test_names) {
expect_equal(str_r, str_py)
})

# maybe this test simply shouldn't be run if there is a known issue with reticulate
test_that(
paste0("Comparing an anndata with X '", name, "' with reticulate works"),
{
Expand Down
1 change: 0 additions & 1 deletion tests/testthat/test-roundtrip-layers.R
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ for (name in test_names) {

gc()

# maybe this test simply shouldn't be run if there is a known issue with reticulate
test_that(
paste0(
"Comparing an anndata with layer '",
Expand Down
1 change: 0 additions & 1 deletion tests/testthat/test-roundtrip-obsmvarm.R
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ for (name in test_names) {
}
)

# maybe this test simply shouldn't be run if there is a known issue with reticulate
test_that(
paste0(
"Comparing an anndata with obsm and varm '",
Expand Down
1 change: 0 additions & 1 deletion tests/testthat/test-roundtrip-obspvarp.R
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ for (name in test_names) {
}
)

# maybe this test simply shouldn't be run if there is a known issue with reticulate
test_that(
paste0(
"Comparing an anndata with obsp and varp '",
Expand Down
1 change: 0 additions & 1 deletion tests/testthat/test-roundtrip-obsvar.R
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ for (name in test_names) {
expect_equal(str_r, str_py)
})

# maybe this test simply shouldn't be run if there is a known issue with reticulate
test_that(
paste0(
"Comparing an anndata with obs and var '",
Expand Down
1 change: 0 additions & 1 deletion tests/testthat/test-roundtrip-uns-nested.R
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ for (name in test_names) {
expect_equal(str_r, str_py)
})

# maybe this test simply shouldn't be run if there is a known issue with reticulate
test_that(
paste0(
"Comparing an anndata with uns_nested '",
Expand Down
1 change: 0 additions & 1 deletion tests/testthat/test-roundtrip-uns.R
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ for (name in test_names) {
expect_equal(str_r, str_py)
})

# maybe this test simply shouldn't be run if there is a known issue with reticulate
test_that(
paste0("Comparing an anndata with uns '", name, "' with reticulate works"),
{
Expand Down
4 changes: 2 additions & 2 deletions vignettes/known_issues.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ vignette: >
This document lists known issues with the package and suggests possible solutions.

```{r known-issues, echo=FALSE, results="asis"}
# how to get a file from a package
data <- yaml::read_yaml(system.file("known_issues.yaml", package = "anndataR"))$known_issues
known_issues_path <- system.file("known_issues.yaml", package = "anndataR")
data <- yaml::read_yaml(known_issues_path)$known_issues

for (i in seq_along(data)) {
str <- paste0(
Expand Down
Loading