Skip to content

Commit

Permalink
Merge branch 'RELEASE_3_18' into devel
Browse files Browse the repository at this point in the history
* RELEASE_3_18:
  Fix typo in the AnnData Conversion docs
  Fix v0.10.2 environment instantiation
  • Loading branch information
lazappi committed Nov 13, 2023
2 parents 841c2d7 + 4cb6fc2 commit a36390b
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: zellkonverter
Title: Conversion Between scRNA-seq Objects
Version: 1.13.0
Date: 2023-10-25
Version: 1.13.1
Date: 2023-11-13
Authors@R:
c(person(given = "Luke",
family = "Zappia",
Expand Down
10 changes: 10 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

* Bioconductor 3.19, May 2023

## zellkonverter 1.13.1 (2023-11-13)

* Fix the **anndata** v0.10.2 environment instantiation (Fixes #103)
* Fix a type in the AnnData Conversion docs (Fixes #100)

## zellkonverter 1.13.0 (2023-10-25)

* Bioconductor 3.19 devel
Expand All @@ -10,6 +15,11 @@

* Bioconductor 3.18, October 2023

## zellkonverter 1.12.1 (2023-11-13)

* Fix the **anndata** v0.10.2 environment instantiation (Fixes #103)
* Fix a type in the AnnData Conversion docs (Fixes #100)

## zellkonverter 1.11.4 (2023-10-16)

* Add environment for **anndata** v0.10.2
Expand Down
2 changes: 1 addition & 1 deletion R/AnnData2SCE.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#' Convert AnnData between and SingleCellExperiment
#' Convert between AnnData and SingleCellExperiment
#'
#' Conversion between Python AnnData objects and
#' \linkS4class{SingleCellExperiment} objects.
Expand Down
2 changes: 1 addition & 1 deletion R/basilisk.R
Original file line number Diff line number Diff line change
Expand Up @@ -154,4 +154,4 @@ zellkonverterAnnDataEnv <- function(version = .AnnDataVersions) {
anndata_env_0.7.6 <- zellkonverterAnnDataEnv(version = "0.7.6")
anndata_env_0.8.0 <- zellkonverterAnnDataEnv(version = "0.8.0")
anndata_env_0.9.2 <- zellkonverterAnnDataEnv(version = "0.9.2")
anndata_env_0.9.2 <- zellkonverterAnnDataEnv(version = "0.10.2")
anndata_env_0.10.2 <- zellkonverterAnnDataEnv(version = "0.10.2")

0 comments on commit a36390b

Please sign in to comment.