Skip to content

Commit c9f2660

Browse files
author
satijalab
authored
Merge pull request satijalab#2002 from satijalab/develop
Seurat v3.1.0
2 parents 245d72b + cf05ccc commit c9f2660

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+3597
-915
lines changed

.Rbuildignore

+1
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
appveyor.yml
77
cran-comments.md
88
travis_setup.sh
9+
CODE_OF_CONDUCT.md

.travis.yml

+9-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,14 @@ os:
88
- linux
99
- osx
1010

11-
r: release
11+
r:
12+
- release
13+
- devel
14+
15+
matrix:
16+
exclude:
17+
- r: devel
18+
os: osx
1219

1320
env:
1421
global:
@@ -18,7 +25,7 @@ env:
1825
- HDF5_VERSION=1.8.17
1926
- HDF5_RELEASE_URL="https://support.hdfgroup.org/ftp/HDF5/releases"
2027

21-
before_install:
28+
before_install:
2229
- chmod +x travis_setup.sh
2330
- ./travis_setup.sh
2431

CODE_OF_CONDUCT.md

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to making participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, sex characteristics, gender identity and expression,
9+
level of experience, education, socio-economic status, nationality, personal
10+
appearance, race, religion, or sexual identity and orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
* Using welcoming and inclusive language
18+
* Being respectful of differing viewpoints and experiences
19+
* Gracefully accepting constructive criticism
20+
* Focusing on what is best for the community
21+
* Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
* Trolling, insulting/derogatory comments, and personal or political attacks
28+
* Public or private harassment
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies both within project spaces and in public spaces
49+
when an individual is representing the project or its community. Examples of
50+
representing a project or community include using an official project e-mail
51+
address, posting via an official social media account, or acting as an appointed
52+
representative at an online or offline event. Representation of a project may be
53+
further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting the project team at [email protected]. All
59+
complaints will be reviewed and investigated and will result in a response that
60+
is deemed necessary and appropriate to the circumstances. The project team is
61+
obligated to maintain confidentiality with regard to the reporter of an incident.
62+
Further details of specific enforcement policies may be posted separately.
63+
64+
Project maintainers who do not follow or enforce the Code of Conduct in good
65+
faith may face temporary or permanent repercussions as determined by other
66+
members of the project's leadership.
67+
68+
## Attribution
69+
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71+
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
72+
73+
[homepage]: https://www.contributor-covenant.org
74+
75+
For answers to common questions about this code of conduct, see
76+
https://www.contributor-covenant.org/faq

DESCRIPTION

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: Seurat
2-
Version: 3.0.2
3-
Date: 2019-06-14
2+
Version: 3.1.0
3+
Date: 2019-08-20
44
Title: Tools for Single Cell Genomics
55
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>, and Butler A and Satija R (2017) <doi:10.1101/164889> for more details.
66
Authors@R: c(
@@ -11,7 +11,8 @@ Authors@R: c(
1111
person(given = 'Jeff', family = 'Farrell', email = '[email protected]', role = 'ctb'),
1212
person(given = 'Shiwei', family = 'Zheng', email = '[email protected]', role = 'ctb', comment = c(ORCID = '0000-0001-6682-6743')),
1313
person(given = 'Christoph', family = 'Hafemeister', email = '[email protected]', role = 'ctb', comment = c(ORCID = '0000-0001-6365-8254')),
14-
person(given = 'Patrick', family = 'Roelli', email = '[email protected]', role = 'ctb')
14+
person(given = 'Patrick', family = 'Roelli', email = '[email protected]', role = 'ctb'),
15+
person(given = "Yuhan", family = "Hao", email = '[email protected]', role = 'ctb', comment = c(ORCID = '0000-0002-1810-0822'))
1516
)
1617
URL: http://www.satijalab.org/seurat, https://github.com/satijalab/seurat
1718
BugReports: https://github.com/satijalab/seurat/issues
@@ -36,16 +37,18 @@ Imports:
3637
igraph,
3738
irlba,
3839
KernSmooth,
40+
leiden (>= 0.3.1),
3941
lmtest,
4042
MASS,
41-
Matrix (>= 1.2.14),
43+
Matrix (>= 1.2-14),
4244
metap,
4345
pbapply,
4446
plotly,
4547
png,
4648
RANN,
4749
RColorBrewer,
4850
Rcpp,
51+
RcppAnnoy,
4952
reticulate,
5053
rlang,
5154
ROCR,
@@ -57,7 +60,8 @@ Imports:
5760
stats,
5861
tools,
5962
tsne,
60-
utils
63+
utils,
64+
uwot
6165
LinkingTo: Rcpp (>= 0.11.0), RcppEigen, RcppProgress
6266
License: GPL-3 | file LICENSE
6367
LazyData: true

NAMESPACE

+17-3
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ export("VariableFeatures<-")
161161
export(ALRAChooseKPlot)
162162
export(AddMetaData)
163163
export(AddModuleScore)
164+
export(Assays)
164165
export(AugmentPlot)
165166
export(AverageExpression)
166167
export(BarcodeInflectionsPlot)
@@ -174,7 +175,9 @@ export(CellCycleScoring)
174175
export(CellScatter)
175176
export(CellSelector)
176177
export(Cells)
178+
export(CollapseEmbeddingOutliers)
177179
export(CollapseSpeciesExpressionMatrix)
180+
export(ColorDimSplit)
178181
export(CombinePlots)
179182
export(Command)
180183
export(CreateAssayObject)
@@ -249,6 +252,7 @@ export(PercentageFeatureSet)
249252
export(PlotClusterTree)
250253
export(PolyDimPlot)
251254
export(PolyFeaturePlot)
255+
export(PrepSCTIntegration)
252256
export(Project)
253257
export(ProjectDim)
254258
export(PurpleAndYellow)
@@ -257,6 +261,7 @@ export(Read10X_h5)
257261
export(ReadAlevin)
258262
export(ReadAlevinCsv)
259263
export(ReadH5AD)
264+
export(Reductions)
260265
export(RelativeCounts)
261266
export(RenameCells)
262267
export(RenameIdents)
@@ -320,7 +325,6 @@ import(Matrix)
320325
importClassesFrom(Matrix,dgCMatrix)
321326
importFrom(KernSmooth,bkde)
322327
importFrom(MASS,glm.nb)
323-
importFrom(MASS,kde2d)
324328
importFrom(Matrix,Matrix)
325329
importFrom(Matrix,as.matrix)
326330
importFrom(Matrix,colMeans)
@@ -334,6 +338,10 @@ importFrom(RColorBrewer,brewer.pal.info)
334338
importFrom(ROCR,performance)
335339
importFrom(ROCR,prediction)
336340
importFrom(Rcpp,evalCpp)
341+
importFrom(RcppAnnoy,AnnoyAngular)
342+
importFrom(RcppAnnoy,AnnoyEuclidean)
343+
importFrom(RcppAnnoy,AnnoyHamming)
344+
importFrom(RcppAnnoy,AnnoyManhattan)
337345
importFrom(Rtsne,Rtsne)
338346
importFrom(SDMTools,pnt.in.poly)
339347
importFrom(ape,as.phylo)
@@ -435,8 +443,11 @@ importFrom(ica,icaimax)
435443
importFrom(ica,icajade)
436444
importFrom(igraph,E)
437445
importFrom(igraph,graph.adjacency)
446+
importFrom(igraph,graph_from_adj_list)
447+
importFrom(igraph,graph_from_adjacency_matrix)
438448
importFrom(igraph,plot.igraph)
439449
importFrom(irlba,irlba)
450+
importFrom(leiden,leiden)
440451
importFrom(lmtest,lrtest)
441452
importFrom(metap,minimump)
442453
importFrom(methods,"slot<-")
@@ -492,7 +503,6 @@ importFrom(stats,na.omit)
492503
importFrom(stats,p.adjust)
493504
importFrom(stats,pchisq)
494505
importFrom(stats,pnbinom)
495-
importFrom(stats,pnorm)
496506
importFrom(stats,poisson)
497507
importFrom(stats,prcomp)
498508
importFrom(stats,prop.test)
@@ -513,14 +523,18 @@ importFrom(tsne,tsne)
513523
importFrom(utils,.DollarNames)
514524
importFrom(utils,argsAnywhere)
515525
importFrom(utils,browseURL)
526+
importFrom(utils,capture.output)
516527
importFrom(utils,file_test)
517-
importFrom(utils,getAnywhere)
518528
importFrom(utils,globalVariables)
529+
importFrom(utils,isS3method)
530+
importFrom(utils,isS3stdGeneric)
531+
importFrom(utils,methods)
519532
importFrom(utils,packageVersion)
520533
importFrom(utils,read.csv)
521534
importFrom(utils,read.delim)
522535
importFrom(utils,read.table)
523536
importFrom(utils,setTxtProgressBar)
524537
importFrom(utils,txtProgressBar)
525538
importFrom(utils,write.table)
539+
importFrom(uwot,umap)
526540
useDynLib(Seurat)

NEWS.md

+30
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,36 @@
22
All notable changes to Seurat will be documented in this file.
33
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
44

5+
## [3.1.0] - 2019-08-20
6+
### Added
7+
- New `PrepSCTIntegrati
8+
- on` function to facilitate integration after `SCTransform`
9+
- Reference-based integration with the `reference` parameter in `FindIntegrationAnchors`
10+
- Reciprocal PCA as a `reduction` option in `FindIntegrationAnchors`
11+
- New `CollapseEmbeddingOutliers` function
12+
- Enable `FindTransferAnchors` after `SCTransform`
13+
- Added back `ColorDimSplit` functionality
14+
- Include a code of conduct
15+
- Added uwot support as new default UMAP method
16+
- Added `CheckDots` to catch unused parameters and suggest updated names
17+
- `Reductions` and `Assays` assays functions to list stored DimReducs and Assays
18+
19+
### Changed
20+
- Fix regex in `LogSeuratCommand`
21+
- Check for NAs in feature names in `Read10X`
22+
- Prevent dimnames for counts/data/scale.data matrices from being arrays
23+
- Updates `ReadH5AD` to distinguish FVF methods
24+
- Fixes to UpdateSeuratObject for v2 objects
25+
- Sink all output from stdout to stderr
26+
- Fix to scale.data cell ordering after subsetting
27+
- Enable `Assay` specification in `BuildClusterTree`
28+
- Fix `FeaturePlot` when using both `blend` and `split.by`
29+
- Fix to `WhichCells` when passing `cells` and `invert`
30+
- Fix to `HoverLocator` labels and title
31+
- Ensure features names don't contain pipes (`|`)
32+
- Deprecation of `RunLSI` and `RunALRA`
33+
- Fix legend bug when sorting in `ExIPlot`
34+
535
## [3.0.2] - 2019-06-07
636
### Added
737
- Flag to skip singleton grouping in `FindClusters`

R/RcppExports.R

-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ LogNorm <- function(data, scale_factor, display_progress = TRUE) {
2121
.Call('_Seurat_LogNorm', PACKAGE = 'Seurat', data, scale_factor, display_progress)
2222
}
2323

24-
FastMatMult <- function(m1, m2) {
25-
.Call('_Seurat_FastMatMult', PACKAGE = 'Seurat', m1, m2)
26-
}
27-
2824
FastRowScale <- function(mat, scale = TRUE, center = TRUE, scale_max = 10, display_progress = TRUE) {
2925
.Call('_Seurat_FastRowScale', PACKAGE = 'Seurat', mat, scale, center, scale_max, display_progress)
3026
}

0 commit comments

Comments
 (0)