Skip to content

Commit ca4c48b

Browse files
committed
Merge branch 'develop'
2 parents 57564e2 + 53cf1f8 commit ca4c48b

File tree

203 files changed

+20875
-2227
lines changed

Some content is hidden

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

203 files changed

+20875
-2227
lines changed

.Rbuildignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
^renv$
2+
^renv\.lock$
13
^.*\.Rproj$
24
^\.Rproj\.user$
35
^.*\.old$

.github/workflows/R_CMD_check.yaml

+16-8
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
- develop
66
pull_request:
77

8+
env:
9+
GITHUB_PAT: ${{ secrets.PAT }}
10+
811
jobs:
912
r-cmd-check:
1013

@@ -13,21 +16,26 @@ jobs:
1316
name: R CMD check
1417
container:
1518
image: satijalab/seurat:develop
16-
runs-on: self-hosted
19+
runs-on: [ self-hosted ]
1720

1821
steps:
19-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v3
2023
- name: Remove vignettes dir
2124
run: rm -rf 'vignettes/'
2225
shell: bash
2326

27+
- name: Install additional dependencies
28+
run: |
29+
Rscript -e "remotes::install_github('mojaveazure/seurat-object', ref = 'feat/CalN_generic')"
30+
Rscript -e "remotes::install_github('bnprks/BPCells')"
31+
2432
- name: Check
2533
run: devtools::check(args = "--no-manual", error_on = "warning", check_dir = "check", force_suggests = FALSE)
2634
shell: Rscript {0}
2735

28-
- name: Upload check results
29-
if: failure()
30-
uses: actions/upload-artifact@master
31-
with:
32-
name: results
33-
path: check
36+
# - name: Upload check results
37+
# if: failure()
38+
# uses: actions/upload-artifact@master
39+
# with:
40+
# name: results
41+
# path: check

DESCRIPTION

+28-10
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
11
Package: Seurat
2-
Version: 4.4.0
3-
Date: 2023-09-26
2+
Version: 5.0.0
3+
Date: 2023-10-23
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>, 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.
66
Authors@R: c(
77
person(given = "Andrew", family = "Butler", email = "[email protected]", role = "ctb", comment = c(ORCID = "0000-0003-3608-0463")),
88
person(given = "Saket", family = "Choudhary", email = "[email protected]", role = "ctb", comment = c(ORCID = "0000-0001-5202-7633")),
99
person(given = "Charlotte", family = "Darby", email = "[email protected]", role = "ctb", comment = c(ORCID = "0000-0003-2195-5300")),
1010
person(given = "Jeff", family = "Farrell", email = "[email protected]", role = "ctb"),
11+
person(given = "Isabella", family = "Grabski", email = "[email protected]", role = "ctb", comment = c(ORCID = "0000-0002-0616-5469")),
1112
person(given = "Christoph", family = "Hafemeister", email = "[email protected]", role = "ctb", comment = c(ORCID = "0000-0001-6365-8254")),
1213
person(given = "Yuhan", family = "Hao", email = "[email protected]", role = "ctb", comment = c(ORCID = "0000-0002-1810-0822")),
1314
person(given = "Austin", family = "Hartman", email = "[email protected]", role = "ctb", comment = c(ORCID = "0000-0001-7278-1852")),
14-
person(given = "Paul", family = "Hoffman", email = "[email protected]", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7693-8957")),
15+
person(given = "Paul", family = "Hoffman", email = "[email protected]", role = "ctb", comment = c(ORCID = "0000-0002-7693-8957")),
1516
person(given = "Jaison", family = "Jain", email = "[email protected]", role = "ctb", comment = c(ORCID = "0000-0002-9478-5018")),
17+
person(given = "Longda", family = "Jiang", email = "[email protected]", role = "ctb", comment = c(ORCID = "0000-0003-4964-6497")),
1618
person(given = "Madeline", family = "Kowalski", email = "[email protected]", role = "ctb", comment = c(ORCID = "0000-0002-5655-7620")),
19+
person(given = "Skylar", family = "Li", email = "[email protected]", role = "ctb"),
20+
person(given = "Gesmira", family = "Molla", email = '[email protected]', role = 'ctb', comment = c(ORCID = '0000-0002-8628-5056')),
1721
person(given = "Efthymia", family = "Papalexi", email = "[email protected]", role = "ctb", comment = c(ORCID = "0000-0001-5898-694X")),
1822
person(given = "Patrick", family = "Roelli", email = "[email protected]", role = "ctb"),
19-
person(given = "Rahul", family = "Satija", email = "rsatija@nygenome.org", role = "ctb", comment = c(ORCID = "0000-0001-9448-8833")),
23+
person(given = "Rahul", family = "Satija", email = "seurat@nygenome.org", role = c("aut", "cre"), comment = c(ORCID = "0000-0001-9448-8833")),
2024
person(given = "Karthik", family = "Shekhar", email = "[email protected]", role = "ctb"),
2125
person(given = "Avi", family = "Srivastava", email = "[email protected]", role = "ctb", comment = c(ORCID = "0000-0001-9798-2079")),
2226
person(given = "Tim", family = "Stuart", email = "[email protected]", role = "ctb", comment = c(ORCID = "0000-0002-3044-0897")),
@@ -26,15 +30,19 @@ Authors@R: c(
2630
)
2731
URL: https://satijalab.org/seurat, https://github.com/satijalab/seurat
2832
BugReports: https://github.com/satijalab/seurat/issues
33+
Additional_repositories: https://satijalab.r-universe.dev, https://bnprks.r-universe.dev
2934
Depends:
3035
R (>= 4.0.0),
31-
methods
36+
methods,
37+
SeuratObject (>= 5.0.0)
3238
Imports:
3339
cluster,
3440
cowplot,
41+
fastDummies,
3542
fitdistrplus,
3643
future,
3744
future.apply,
45+
generics (>= 0.1.3),
3846
ggplot2 (>= 3.3.0),
3947
ggrepel,
4048
ggridges,
@@ -48,6 +56,7 @@ Imports:
4856
jsonlite,
4957
KernSmooth,
5058
leiden (>= 0.3.1),
59+
lifecycle,
5160
lmtest,
5261
MASS,
5362
Matrix (>= 1.5-0),
@@ -63,22 +72,23 @@ Imports:
6372
RColorBrewer,
6473
Rcpp (>= 1.0.7),
6574
RcppAnnoy (>= 0.0.18),
75+
RcppHNSW,
6676
reticulate,
6777
rlang,
6878
ROCR,
79+
RSpectra,
6980
Rtsne,
7081
scales,
7182
scattermore (>= 1.2),
72-
sctransform (>= 0.4.0),
73-
SeuratObject (>= 4.1.4),
83+
sctransform (>= 0.4.1),
7484
shiny,
7585
spatstat.explore,
7686
spatstat.geom,
7787
stats,
7888
tibble,
7989
tools,
8090
utils,
81-
uwot (>= 0.1.14)
91+
uwot (>= 0.1.10)
8292
LinkingTo: Rcpp (>= 0.11.0), RcppEigen, RcppProgress
8393
License: MIT + file LICENSE
8494
LazyData: true
@@ -93,16 +103,21 @@ Collate:
93103
'differential_expression.R'
94104
'dimensional_reduction.R'
95105
'integration.R'
106+
'zzz.R'
107+
'integration5.R'
96108
'mixscape.R'
97109
'objects.R'
98110
'preprocessing.R'
111+
'preprocessing5.R'
112+
'roxygen.R'
113+
'sketching.R'
99114
'tree.R'
100115
'utilities.R'
101-
'zzz.R'
102116
RoxygenNote: 7.2.3
103117
Encoding: UTF-8
104118
Suggests:
105119
ape,
120+
BPCells,
106121
rsvd,
107122
testthat,
108123
hdf5r,
@@ -126,4 +141,7 @@ Suggests:
126141
mixtools,
127142
ggrastr,
128143
data.table,
129-
R.utils
144+
R.utils,
145+
presto,
146+
DelayedArray,
147+
harmony

0 commit comments

Comments
 (0)