Skip to content

Commit

Permalink
Merge pull request satijalab#663 from satijalab/fix/spatstat
Browse files Browse the repository at this point in the history
[WIP] Replace {spatstat.core} with {spatstat.explore}
  • Loading branch information
AustinHartman authored Nov 7, 2022
2 parents 9a09a9b + b51d62b commit 4ca6522
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Imports:
sctransform (>= 0.3.4),
SeuratObject (>= 4.1.2),
shiny,
spatstat.core,
spatstat.explore,
spatstat.geom,
stats,
tibble,
Expand Down
2 changes: 1 addition & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ importFrom(shiny,sliderInput)
importFrom(shiny,stopApp)
importFrom(shiny,updateSelectInput)
importFrom(shiny,verbatimTextOutput)
importFrom(spatstat.core,markvario)
importFrom(spatstat.explore,markvario)
importFrom(spatstat.geom,ppp)
importFrom(stats,aggregate)
importFrom(stats,anova)
Expand Down
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Unreleased

## Changes
- Replaced import from {spatstat.core} with {spatstat.explore}
- Fix bug in `FindMarkers()` when using `SCT` assay ([#6856](https://github.com/satijalab/seurat/issues/6586))

# Seurat 4.2.0 (2022-09-21)
Expand Down
2 changes: 1 addition & 1 deletion R/preprocessing.R
Original file line number Diff line number Diff line change
Expand Up @@ -1338,7 +1338,7 @@ RelativeCounts <- function(data, scale.factor = 1, verbose = TRUE) {
#' @param data Matrix containing the data used as "marks" (e.g. gene expression)
#' @param ... Arguments passed to markvario
#'
#' @importFrom spatstat.core markvario
#' @importFrom spatstat.explore markvario
#' @importFrom spatstat.geom ppp
#'
#' @export
Expand Down

0 comments on commit 4ca6522

Please sign in to comment.