Skip to content

Commit

Permalink
Merge pull request #9559 from satijalab/fix/umap-learn-version-check
Browse files Browse the repository at this point in the history
Fix/umap-learn version check
  • Loading branch information
dcollins15 authored Dec 18, 2024
2 parents d015357 + 34bae9d commit 727c71a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: Seurat
Version: 5.1.0.9010
Version: 5.1.0.9011
Title: Tools for Single Cell Genomics
Description: A toolkit for quality control, analysis, and exploration of single cell RNA sequencing data. 'Seurat' aims to enable users to identify and interpret sources of heterogeneity from single cell transcriptomic measurements, and to integrate diverse types of single cell data. See Satija R, Farrell J, Gennert D, et al (2015) <doi:10.1038/nbt.3192>, Macosko E, Basu A, Satija R, et al (2015) <doi:10.1016/j.cell.2015.05.002>, Stuart T, Butler A, et al (2019) <doi:10.1016/j.cell.2019.05.031>, and Hao, Hao, et al (2020) <doi:10.1101/2020.10.12.335331> for more details.
Authors@R: c(
Expand Down
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Unreleased

## Changes
- Updated `RunUMAP` to support `umap-learn` version >= 0.5.0 ([#9559](https://github.com/satijalab/seurat/pull/9559))
- Surfaced more fine-grained control over what parts of a Xenium experiment are loaded in `LoadXenium`
- Added ability to load Xenium nucleus segmentation masks
- Updated `LoadXenium` to also read some run metadata (run start time, preservation method, panel used, organism, tissue type, instrument software version and stain kit used) into `misc` slot
Expand Down Expand Up @@ -238,6 +239,7 @@
- Add `rlsi` option for `FindIntegrationAnchors()`

## Changes
-
- Preserve feature metadata when converting from `SingleCellExperiment` to `SeuratObject` class
([#4205](https://github.com/satijalab/seurat/issues/4205))
- Preserve multiple assays when converting from `SingleCellExperiment` to `SeuratObject` class
Expand Down
6 changes: 3 additions & 3 deletions R/dimensional_reduction.R
Original file line number Diff line number Diff line change
Expand Up @@ -1370,7 +1370,7 @@ RunUMAP.default <- function(
umap_import <- import(module = "umap", delay_load = TRUE)
sklearn <- import("sklearn", delay_load = TRUE)
if (densmap &&
numeric_version(x = umap_import$pkg_resources$get_distribution("umap-learn")$version) <
numeric_version(x = umap_import$`__version__`) <
numeric_version(x = "0.5.0")) {
stop("densmap is only supported by versions >= 0.5.0 of umap-learn. Upgrade umap-learn (e.g. pip install --upgrade umap-learn).")
}
Expand All @@ -1394,7 +1394,7 @@ RunUMAP.default <- function(
angular_rp_forest = angular.rp.forest,
verbose = verbose
)
if (numeric_version(x = umap_import$pkg_resources$get_distribution("umap-learn")$version) >=
if (numeric_version(x = umap_import$`__version__`) >=
numeric_version(x = "0.5.0")) {
umap.args <- c(umap.args, list(
densmap = densmap,
Expand Down Expand Up @@ -1613,7 +1613,7 @@ RunUMAP.Graph <- function(
metric_kwds = metric.kwds,
verbose = verbose
)
if (numeric_version(x = umap$pkg_resources$get_distribution("umap-learn")$version) >=
if (numeric_version(x = umap$`__version__`) >=
numeric_version(x = "0.5.0")) {
umap.args <- c(umap.args, list(
densmap = densmap,
Expand Down

0 comments on commit 727c71a

Please sign in to comment.