Skip to content

Commit

Permalink
Merge pull request #817 from jiajic/suite_modular
Browse files Browse the repository at this point in the history
Small changes and version bump
  • Loading branch information
jiajic authored Nov 29, 2023
2 parents 85d4cb6 + 8f5dd12 commit ff11ea5
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: Giotto
Title: Spatial Single-Cell Transcriptomics Toolbox
Version: 3.3.2
Version: 4.0.0
Authors@R: c(
person("Ruben", "Dries", email = "[email protected]",
role = c("aut", "cre")),
Expand Down
4 changes: 2 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Giotto Suite 3.3.2 (Release TBD)
# Giotto Suite 4.0.0 2023*11*29)

## Breaking Changes
* Update to modular package organization with the main packages being `GiottoUtils`, `GiottoClass`, `GiottoVisuals`, and `Giotto` as the analytical umbrella package.

## Added

Expand All @@ -15,7 +16,6 @@

## Changes

* Improved performance of gefToGiotto()


# Giotto Suite 3.3.1 (2023*08*02)
Expand Down
8 changes: 5 additions & 3 deletions R/differential_expression.R
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ findScranMarkers <- function(gobject,
group_1_name = NULL,
group_2 = NULL,
group_2_name = NULL,
verbose = FALSE,
verbose = TRUE,
...) {


Expand All @@ -47,10 +47,12 @@ findScranMarkers <- function(gobject,


# print message with information #
if(verbose) wrap_msg("using 'Scran' to detect marker genes. If used in published research, please cite:
if(isTRUE(verbose)) {
wrap_msg("Using 'Scran' to detect marker genes. If used in published research, please cite:
Lun ATL, McCarthy DJ, Marioni JC (2016).
'A step-by-step workflow for low-level analysis of single-cell RNA-seq data with Bioconductor.'
F1000Res., 5, 2122. doi: 10.12688/f1000research.9501.2. ")
F1000Res., 5, 2122. doi: 10.12688/f1000research.9501.2.")
}


# Set feat_type and spat_unit
Expand Down
2 changes: 1 addition & 1 deletion R/dimension_reduction.R
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@ runPCA_BiocSingular_irlba_projection = function(x,
#' @param feat_type feature type
#' @param expression_values expression values to use
#' @param reduction cells or genes
#' @param random_subset random subset to perform PCA on
#' @param random_subset numeric. random subset to perform PCA on
#' @param name arbitrary name for PCA run
#' @param feats_to_use subset of features to use for PCA
#' @param return_gobject boolean: return giotto object (default = TRUE)
Expand Down
2 changes: 1 addition & 1 deletion man/findScranMarkers.Rd

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

2 changes: 1 addition & 1 deletion man/reexports.Rd

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion man/runPCAprojection.Rd

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

0 comments on commit ff11ea5

Please sign in to comment.