Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Giotto 4.1.3 #1057

Merged
merged 147 commits into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
147 commits
Select commit Hold shift + click to select a range
04ec736
fix: allow instructions passing for Xenium conv.
jiajic Aug 13, 2024
26bedbd
chore: bump version and update news
jiajic Aug 13, 2024
e7c043e
Merge branch 'drieslab:suite_dev' into suite_dev
jiajic Aug 13, 2024
9aa3293
Merge pull request #1011 from jiajic/suite_dev
jiajic Aug 13, 2024
6981e24
Update spatial_clusters.R
JunxiangXu Aug 16, 2024
db1219e
Merge pull request #1014 from JunxiangXu/suite_dev
RubD Aug 16, 2024
83b8ca9
update R version
josschavezf Aug 16, 2024
523103d
Merge pull request #1015 from josschavezf/suite_dev
josschavezf Aug 16, 2024
c4464e2
Refine: format, document, and genernalized funcs
wwang-chcn Aug 28, 2024
ddbbd30
Add: install ontrac env func
wwang-chcn Aug 28, 2024
225124c
chore: move some deps to suggests
jiajic Sep 3, 2024
eeefba8
Merge pull request #1020 from jiajic/suite_dev
jiajic Sep 3, 2024
5340fad
Add: install and run ONTraC through Giotto funcs
wwang-chcn Sep 3, 2024
16b4000
chore: update GiottoUtils requirement
jiajic Sep 4, 2024
86497bd
chore: remove deprecated functions & update PAGE example
jiajic Sep 4, 2024
27d5e78
chore: reflow example
jiajic Sep 4, 2024
b5cc77d
chore: remove `progressr`. Use giottoutils export
jiajic Sep 4, 2024
0c50bac
chore: fix `cellProximityEnrichmentSpots()` example
jiajic Sep 4, 2024
d94a29f
chore: finish removing `reshape2`
jiajic Sep 4, 2024
c80b58b
chore: remove jsonlite references
jiajic Sep 4, 2024
6311dd4
chore: remove packages moved to GiottoUtils
jiajic Sep 4, 2024
28bd668
Change: param name, add more descriptions
wwang-chcn Sep 6, 2024
5f7560b
Merge remote-tracking branch 'upstream/suite_dev' into suite_dev
wwang-chcn Sep 6, 2024
8119be9
chore: isolate `cowplot` dep to GiottoVisuals
jiajic Sep 6, 2024
44ff4f9
Add: normalization param
wwang-chcn Sep 6, 2024
6bf15c7
Update: doc
wwang-chcn Sep 6, 2024
f98877d
Remove: unused function
wwang-chcn Sep 9, 2024
43624af
Update: using shell to run ONTraC
wwang-chcn Sep 9, 2024
3cbf34e
Update: normalization param
wwang-chcn Sep 9, 2024
9e81c0a
change: deprecate `name` arg in `screePlot()`
jiajic Sep 11, 2024
3127cdb
chore: remove some deps and some deprecated functions
jiajic Sep 12, 2024
3b738f7
chore: bump version for dev
jiajic Sep 12, 2024
efdf9c0
chore: update deprecated accessors
jiajic Sep 12, 2024
15c4fb9
Merge pull request #1022 from jiajic/suite_dev
jiajic Sep 12, 2024
efbfb3d
chore: cleanup some remaining dep accessors
jiajic Sep 13, 2024
c699ba6
Merge pull request #1023 from jiajic/suite_dev
jiajic Sep 13, 2024
df89027
Update VisiumHD Convenience Function
iqraAmin Sep 15, 2024
f4100e8
chore: refactor pca code
jiajic Sep 16, 2024
4c13045
Merge pull request #1026 from jiajic/suite_dev
jiajic Sep 16, 2024
4267c1a
chore: minor edits
jiajic Sep 17, 2024
e0dcf33
chore: minor edits
jiajic Sep 17, 2024
03b0015
chore: refactor pearson norm
jiajic Sep 17, 2024
8598626
Merge pull request #1027 from jiajic/suite_dev
jiajic Sep 17, 2024
dc5ba83
feat: quantile norm
jiajic Sep 17, 2024
6d3c3c5
chore: fix tags
jiajic Sep 17, 2024
5571c7a
chore: code reorganization
jiajic Sep 17, 2024
d87e323
chore: docs
jiajic Sep 17, 2024
de6e3c8
chore: styler
jiajic Sep 17, 2024
032f943
chore: docs
jiajic Sep 17, 2024
65819aa
Merge pull request #1028 from jiajic/suite_dev
jiajic Sep 17, 2024
9f28420
Update .visiumHD_poly Function
iqraAmin Sep 18, 2024
1b2e080
Merge pull request #1025 from iqraAmin/modular_readers_dev
jiajic Sep 18, 2024
ca747f1
Init:
wwang-chcn Sep 19, 2024
7cf7912
Merge remote-tracking branch 'upstream/suite_dev' into suite_dev
wwang-chcn Sep 19, 2024
776d635
chore: move ggraph from Suggests to Imports
wwang-chcn Sep 19, 2024
d387fd1
chore: fix ONTraC executable path on Windows system
wwang-chcn Sep 19, 2024
3ab4246
Remove: unused function
wwang-chcn Sep 19, 2024
c57fedd
add function giottoToAnndataZarr
josschavezf Sep 19, 2024
e5334e4
Merge pull request #1030 from josschavezf/suite_dev
josschavezf Sep 19, 2024
6a69b5b
Remove: unused param doc
wwang-chcn Sep 20, 2024
9f0171b
Merge remote-tracking branch 'upstream/suite_dev' into suite_dev
wwang-chcn Sep 20, 2024
c5b7ee4
Fix: typo
wwang-chcn Sep 20, 2024
7dd42f9
Update: docs
wwang-chcn Sep 20, 2024
269a8c8
Fix: typo
wwang-chcn Sep 20, 2024
fec7267
chore: remove deprecated harmony functionalities
jiajic Sep 20, 2024
1b6fcd6
feat: `labelTransfer()`
jiajic Sep 20, 2024
ee10caf
chore: docs
jiajic Sep 20, 2024
71e0d31
chore: news
jiajic Sep 20, 2024
211fefa
Merge pull request #1031 from jiajic/suite_dev
jiajic Sep 23, 2024
b6176d0
Update: doc
wwang-chcn Sep 25, 2024
4c6461c
Update: ontrac results dirs
wwang-chcn Sep 25, 2024
c54a7d7
Merge remote-tracking branch 'upstream/suite_dev' into suite_dev
wwang-chcn Sep 25, 2024
0758b8f
Update: handling niche cluster order
wwang-chcn Sep 26, 2024
7c9b491
fix typo
josschavezf Sep 27, 2024
1c0c6a3
fix typo
josschavezf Sep 27, 2024
b8e6772
update wnn function
josschavezf Sep 27, 2024
d3468ab
Merge branch 'drieslab:suite_dev' into suite_dev
josschavezf Sep 27, 2024
27f5802
Merge pull request #1033 from josschavezf/suite_dev
josschavezf Sep 27, 2024
68b0ad0
update news
josschavezf Sep 27, 2024
99254ad
Merge pull request #1034 from josschavezf/suite_dev
josschavezf Sep 27, 2024
e666816
Merge remote-tracking branch 'upstream/suite_dev' into suite_dev
wwang-chcn Sep 27, 2024
ffd9025
update wnn functions
josschavezf Sep 30, 2024
88f3df3
Merge branch 'suite_dev' of https://github.com/josschavezf/Giotto int…
josschavezf Sep 30, 2024
5756f45
Merge pull request #1037 from josschavezf/suite_dev
josschavezf Sep 30, 2024
cb938b3
Merge pull request #1036 from wwang-chcn/suite_dev
josschavezf Oct 2, 2024
d7a198b
run devtools::document
josschavezf Oct 2, 2024
c2dde5d
fix typo
josschavezf Oct 2, 2024
9d6aba6
run biocthis style
josschavezf Oct 2, 2024
b144f78
update R version
josschavezf Oct 2, 2024
ffd0d4b
use biocstyle
josschavezf Oct 2, 2024
7a463d9
remove lazydata
josschavezf Oct 2, 2024
2100352
adjust line length
josschavezf Oct 2, 2024
f855fd2
add return values
josschavezf Oct 2, 2024
9f8e3d6
Merge pull request #1038 from josschavezf/suite_dev
josschavezf Oct 2, 2024
aec9060
fix: allow processGiotto to skip adjust by default
jiajic Oct 3, 2024
7607ffb
update `update_giotto_params()` usage
jiajic Oct 3, 2024
5ac8f67
missed some
jiajic Oct 3, 2024
f0d6edb
chore: remove name checking
jiajic Oct 3, 2024
b70442e
feat: NMF implementation via RcppML
jiajic Oct 3, 2024
6bd54a4
chore: formatting
jiajic Oct 3, 2024
3cc909f
feat: `reduceDims()` API
jiajic Oct 3, 2024
20177c0
feat: NMF implementation and cleanups
jiajic Oct 3, 2024
8b9c09a
chore: document
jiajic Oct 3, 2024
08d4422
Merge pull request #1039 from jiajic/suite_dev
jiajic Oct 3, 2024
e4a9a48
revert: cluster cells removal. Also some formatting
jiajic Oct 3, 2024
46ba4c3
chore: docs
jiajic Oct 3, 2024
f13d1da
Merge pull request #1040 from jiajic/suite_dev
jiajic Oct 3, 2024
ea21422
fix: upgrade message to error in tsne
jiajic Oct 4, 2024
4056c1d
update jackstraw permPA
jiajic Oct 7, 2024
c4cad36
chore: docs
jiajic Oct 7, 2024
38ddc5a
Merge branch 'suite_dev' of https://github.com/jiajic/Giotto into sui…
jiajic Oct 7, 2024
c1f6c89
Merge pull request #1041 from jiajic/jstraw
jiajic Oct 7, 2024
42b3ab0
Merge branch 'drieslab:suite_dev' into suite_dev
jiajic Oct 7, 2024
0e4597f
chore: remove jackstraw suggested dep
jiajic Oct 7, 2024
80cd727
Merge pull request #1042 from jiajic/suite_dev
jiajic Oct 7, 2024
5993ef7
Update NEWS.md
jiajic Oct 7, 2024
f74c3c2
Merge pull request #1043 from jiajic/suite_dev
jiajic Oct 7, 2024
7d2e60a
updates for jackstraw
jiajic Oct 7, 2024
681a0d8
Merge pull request #1044 from jiajic/suite_dev
jiajic Oct 7, 2024
98f4c53
fix: seed setting
jiajic Oct 8, 2024
d481d44
Merge pull request #1045 from jiajic/suite_dev
jiajic Oct 8, 2024
c0782f4
fix warning
jiajic Oct 8, 2024
221d5ec
Merge pull request #1046 from jiajic/suite_dev
jiajic Oct 8, 2024
da8b4f4
chore: formatting
jiajic Oct 12, 2024
8046e59
!feat: remove re-export of `combineSpatialCellFeatureInfo()`
jiajic Oct 15, 2024
99ce633
Merge pull request #1049 from jiajic/suite_dev
jiajic Oct 15, 2024
bdb9b56
fix: doKmeans
jiajic Oct 15, 2024
0b5d1c1
Merge pull request #1050 from jiajic/suite_dev
jiajic Oct 15, 2024
6d1a7e9
fix: `doHclust()`
jiajic Oct 15, 2024
1c1e565
Merge pull request #1051 from jiajic/suite_dev
jiajic Oct 15, 2024
192cb30
chore: deprecations for normalizeGiotto
jiajic Oct 15, 2024
ad6d004
chore: change libsize 0 detection
jiajic Oct 16, 2024
0c025d1
Merge pull request #1052 from jiajic/suite_dev
jiajic Oct 17, 2024
074b3d8
change: rework spatial splitting to return numeric
jiajic Oct 21, 2024
9037649
enh: identifyTMAcores
jiajic Oct 26, 2024
40e3060
enh: expose angles to test param
jiajic Oct 26, 2024
07df22f
enh: update TMA core detection
jiajic Oct 26, 2024
24c5ec9
chore: use new gwith_seed()
jiajic Oct 27, 2024
e58f161
chore: deps cleanups
jiajic Oct 27, 2024
d0d1f22
Update .Rbuildignore
jiajic Oct 27, 2024
67e9088
Update NEWS.md
jiajic Oct 28, 2024
daabd70
Update NEWS.md
jiajic Oct 28, 2024
611eff1
Merge pull request #1055 from jiajic/suite_dev
jiajic Oct 28, 2024
a526b73
Update NEWS.md
jiajic Oct 28, 2024
1ded09f
Merge pull request #1056 from jiajic/suite_dev
jiajic Oct 28, 2024
fb0f790
chore: return remotes
jiajic Oct 28, 2024
4b892f4
Merge pull request #1058 from jiajic/suite_dev
jiajic Oct 28, 2024
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
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
^renv\.lock$
^Giotto\.Rproj$
^\.Rproj\.user$
^.lintr

^LICENSE\.md$
^README\.Rmd$
Expand Down
5 changes: 5 additions & 0 deletions .lintr
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
linters: linters_with_defaults(
indentation_linter = NULL,
object_name_linter = NULL,
object_length_linter = NULL)

26 changes: 10 additions & 16 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: Giotto
Title: Spatial Single-Cell Transcriptomics Toolbox
Version: 4.1.0
Version: 4.1.3
Authors@R: c(
person("Ruben", "Dries", email = "rubendries@gmail.com",
role = c("aut", "cre"), comment = c(ORCID = "0000-0001-7650-7754")),
Expand All @@ -22,36 +22,27 @@ Authors@R: c(
Description: Toolbox to process, analyze and visualize spatial single-cell expression data.
License: MIT + file LICENSE
Encoding: UTF-8
LazyData: true
URL: https://drieslab.github.io/Giotto/, https://github.com/drieslab/Giotto
BugReports: https://github.com/drieslab/Giotto/issues
RoxygenNote: 7.3.2
Depends:
base (>= 4.1.0),
utils (>= 4.1.0),
R (>= 4.1.0),
R (>= 4.4.1),
methods,
GiottoClass (>= 0.3.3)
Imports:
BiocParallel,
BiocSingular,
checkmate,
cowplot (>= 0.9.4),
data.table (>= 1.12.2),
dbscan (>= 1.1-3),
ggraph,
ggplot2 (>= 3.1.1),
GiottoUtils (>= 0.1.9),
GiottoVisuals (>= 0.2.4),
GiottoUtils (>= 0.1.12),
GiottoVisuals (>= 0.2.5),
igraph (>= 1.2.4.1),
jsonlite,
limma,
Matrix (>= 1.6-2),
MatrixGenerics,
plotly,
progressr,
reshape2,
reticulate (>= 1.25),
Rtsne (>= 0.15),
scales (>= 1.0.0),
sparseMatrixStats,
stats,
Expand All @@ -78,19 +69,19 @@ Suggests:
ggalluvial,
ggdendro,
ggforce,
ggraph,
ggspavis,
graphcoloring,
HDF5Array (>= 1.18.1),
hdf5r,
jackstraw,
kableExtra,
knitr,
limma,
MAST,
miniUI,
multinet (>= 3.0.2),
networkD3,
pheatmap,
plotly,
quadprog,
harmony,
R.utils,
Expand All @@ -99,6 +90,7 @@ Suggests:
rlang,
rhdf5,
RTriangle (>= 1.6-0.10),
Rtsne (>= 0.15),
Rvision,
scater,
scran (>= 1.10.1),
Expand Down Expand Up @@ -134,6 +126,7 @@ Collate:
'differential_expression.R'
'dimension_reduction.R'
'feature_set_enrichment.R'
'filter.R'
'general_help.R'
'giotto_viewer.R'
'globals.R'
Expand All @@ -142,6 +135,7 @@ Collate:
'image_registration.R'
'interactivity.R'
'kriging.R'
'normalize.R'
'package_imports.R'
'poly_influence.R'
'python_hmrf.R'
Expand Down
20 changes: 9 additions & 11 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ export("prov<-")
export("sankeyLabel<-")
export("sankeyRelate<-")
export("spatUnit<-")
export(PAGEEnrich)
export(activeFeatType)
export(activeSpatUnit)
export(addCellIntMetadata)
Expand Down Expand Up @@ -98,7 +97,6 @@ export(combineICG)
export(combineInteractionChangedFeats)
export(combineInteractionChangedGenes)
export(combineMetadata)
export(combineSpatialCellFeatureInfo)
export(combineSpatialCellMetadataInfo)
export(combineToMultiPolygon)
export(compareCellAbundance)
Expand Down Expand Up @@ -127,6 +125,7 @@ export(createGiottoPolygon)
export(createGiottoPolygonsFromDfr)
export(createGiottoPolygonsFromGeoJSON)
export(createGiottoPolygonsFromMask)
export(createGiottoVisiumHDObject)
export(createGiottoVisiumObject)
export(createGiottoXeniumObject)
export(createMerscopeLargeImage)
Expand All @@ -138,14 +137,12 @@ export(createSpatLocsObj)
export(createSpatNetObj)
export(createSpatialDefaultGrid)
export(createSpatialDelaunayNetwork)
export(createSpatialEnrich)
export(createSpatialFeaturesKNNnetwork)
export(createSpatialGenomicsObject)
export(createSpatialGrid)
export(createSpatialKNNnetwork)
export(createSpatialNetwork)
export(createSpatialWeightMatrix)
export(create_jackstrawplot)
export(create_screeplot)
export(crop)
export(cropGiottoLargeImage)
Expand Down Expand Up @@ -242,7 +239,6 @@ export(getGiottoImage)
export(getMultiomics)
export(getNearestNetwork)
export(getONTraCv1Input)
export(getONTraCv2Input)
export(getPolygonInfo)
export(getRainbowColors)
export(getSpatialEnrichment)
Expand All @@ -257,15 +253,14 @@ export(giottoPoints)
export(giottoPolygon)
export(giottoSankeyPlan)
export(giottoToAnnData)
export(giottoToAnndataZarr)
export(giottoToSeurat)
export(giottoToSeuratV4)
export(giottoToSeuratV5)
export(giottoToSpatialExperiment)
export(heatmSpatialCorFeats)
export(heatmSpatialCorGenes)
export(hexVertices)
export(hist)
export(hyperGeometricEnrich)
export(identifyTMAcores)
export(importCosMx)
export(importVisiumHD)
Expand All @@ -274,6 +269,7 @@ export(initHMRF_V2)
export(insertCrossSectionFeatPlot3D)
export(insertCrossSectionSpatPlot3D)
export(installGiottoEnvironment)
export(installGiottoONTraCEnvironment)
export(instructions)
export(interactiveLandmarkSelection)
export(jackstrawPlot)
Expand Down Expand Up @@ -301,7 +297,6 @@ export(plotCCcomDotplot)
export(plotCCcomHeatmap)
export(plotCPF)
export(plotCTCompositionInNicheCluster)
export(plotCTCompositionInProbCluster)
export(plotCellProximityFeatSpot)
export(plotCellProximityFeats)
export(plotCellTypeNTScore)
Expand All @@ -326,6 +321,8 @@ export(plotPCA_3D)
export(plotPolygons)
export(plotRankSpatvsExpr)
export(plotRecovery)
export(plotSpatNicheClusterBin)
export(plotSpatNicheClusterProb)
export(plotStatDelaunayNetwork)
export(plotTSNE)
export(plotTSNE_2D)
Expand All @@ -339,7 +336,6 @@ export(print.combIcfObject)
export(print.icfObject)
export(processGiotto)
export(prov)
export(rankEnrich)
export(rankSpatialCorGroups)
export(read10xAffineImage)
export(readCellMetadata)
Expand All @@ -360,6 +356,7 @@ export(readSpatLocsData)
export(readSpatNetData)
export(reconnectGiottoImage)
export(rectVertices)
export(reduceDims)
export(registerGiottoObjectList)
export(registerGiottoObjectListFiji)
export(registerGiottoObjectListRvision)
Expand All @@ -374,8 +371,9 @@ export(runDWLSDeconv)
export(runGiottoHarmony)
export(runHyperGeometricEnrich)
export(runIntegratedUMAP)
export(runNMF)
export(runONTraCV1)
export(runPAGEEnrich)
export(runPAGEEnrich_OLD)
export(runPCA)
export(runPCAprojection)
export(runPCAprojectionBatch)
Expand Down Expand Up @@ -514,6 +512,7 @@ export(writeHMRFresults)
exportMethods("$")
exportMethods("$<-")
exportMethods(interpolateFeature)
exportMethods(labelTransfer)
import(GiottoClass)
import(GiottoUtils)
import(GiottoVisuals)
Expand Down Expand Up @@ -575,7 +574,6 @@ importFrom(GiottoClass,combineCellData)
importFrom(GiottoClass,combineFeatureData)
importFrom(GiottoClass,combineFeatureOverlapData)
importFrom(GiottoClass,combineMetadata)
importFrom(GiottoClass,combineSpatialCellFeatureInfo)
importFrom(GiottoClass,combineSpatialCellMetadataInfo)
importFrom(GiottoClass,combineToMultiPolygon)
importFrom(GiottoClass,convertGiottoLargeImageToMG)
Expand Down
48 changes: 48 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,51 @@
# Giotto 4.1.3 (2024/10/27)

## New
* Add `giottoToAnndataZarr()` to create a local anndata zarr folder and interact with the vitessceR package.
* `reduceDims()` API function for dimension reductions
* `runNMF()` implementation that works via RcppML

## Changes
* `runWNN()` and `runIntegratedUMAP()` arguments were updated to make the function flexible to handle any number of modalities.
* update `jackstrawPlot()` to make more flexible and efficient. Changed default params for `scaling`, `centering`, and `feats_to_use` to match `runPCA()`
* change warning when reduction "feats" is selected in `runtSNE()` to error to avoid accidentally wiping the `giotto` object.


# Giotto 4.1.2

## Breaking changes
* remove deprecated `PAGEEnrich()`. Use `runPAGEEnrich()` instead
* remove deprecated `rankEnrich()`. Use `runRankEnrich()` instead
* remove deprecated `hyperGeometricEnrich()`. Use `runHyperGeometricEnrich()` instead
* remove deprecated `createSpatialEnrich()`. Use `runSpatialEnrich()` instead
* remove deprecated `heatmSpatialCorGenes()`. Use `heatmSpatialCorFeats()` instead
* remove deprecated `runPAGEEnrich_OLD()`. Use `runPAGEEnrich()` instead
* remove `do_pca`, `expression_values`, `feats_to_use` args from `runGiottoHarmony()`. Running PCA during the `harmony::RunHarmony()` call is deprecated.

## Enhancements
* add `'quantile'` normalization method to `normalizeGiotto()`

## Changes
* `limma`, `plotly`, and `Rtsne` moved to Suggests
* move `progressr` and `jsonlite` dependencies to GiottoUtils v0.1.12
* remove `reshape2` dependency.

## Bug fixes
* `processGiotto()` can now skip adjust step by default

## New
* `identifyTMAcores()` for assigning IDs to tissue microarray spatial data.
* `labelTransfer()` for transferring labels between giotto objects or subsets thereof. Supercedes `doClusterProjection()`

# Giotto 4.1.1

## Bug fixes
* Allow `giottoInstructions` passing for Xenium convenience functions

## Changes
* Deprecate `screePlot()` `name` in favor of `dim_reduction_name` param


# Giotto 4.1.0 (2024/07/31)

## Breaking changes
Expand Down
Loading
Loading