Skip to content

Commit 825e83f

Browse files
Merge branch 'develop' into stephen/cellranger-9.0
2 parents f3f48d4 + 7b70380 commit 825e83f

File tree

245 files changed

+26229
-3334
lines changed

Some content is hidden

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

245 files changed

+26229
-3334
lines changed

.Rbuildignore

Lines changed: 2 additions & 0 deletions
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

Lines changed: 16 additions & 8 deletions
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
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Integration Checks
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
pull_request:
8+
branches:
9+
- develop
10+
11+
jobs:
12+
check-package:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- run: echo "This is a placeholder workflow."

DESCRIPTION

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,27 @@
11
Package: Seurat
2-
Version: 4.3.0.9002
3-
Date: 2023-02-01
2+
Version: 5.1.0.9006
3+
Date: 2024-09-29
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 = "abutler@nygenome.org", role = "ctb", comment = c(ORCID = "0000-0003-3608-0463")),
88
person(given = "Saket", family = "Choudhary", email = "schoudhary@nygenome.org", role = "ctb", comment = c(ORCID = "0000-0001-5202-7633")),
9+
person(given = 'David', family = 'Collins', email = 'dcollins@nygenome.org', role = 'ctb', comment = c(ORCID = '0000-0001-9243-7821')),
910
person(given = "Charlotte", family = "Darby", email = "cdarby@nygenome.org", role = "ctb", comment = c(ORCID = "0000-0003-2195-5300")),
1011
person(given = "Jeff", family = "Farrell", email = "jfarrell@g.harvard.edu", role = "ctb"),
12+
person(given = "Isabella", family = "Grabski", email = "igrabski@nygenome.org", role = "ctb", comment = c(ORCID = "0000-0002-0616-5469")),
1113
person(given = "Christoph", family = "Hafemeister", email = "chafemeister@nygenome.org", role = "ctb", comment = c(ORCID = "0000-0001-6365-8254")),
1214
person(given = "Yuhan", family = "Hao", email = "yhao@nygenome.org", role = "ctb", comment = c(ORCID = "0000-0002-1810-0822")),
1315
person(given = "Austin", family = "Hartman", email = "ahartman@nygenome.org", role = "ctb", comment = c(ORCID = "0000-0001-7278-1852")),
14-
person(given = "Paul", family = "Hoffman", email = "seurat@nygenome.org", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7693-8957")),
16+
person(given = "Paul", family = "Hoffman", email = "hoff0792@umn.edu", role = "ctb", comment = c(ORCID = "0000-0002-7693-8957")),
1517
person(given = "Jaison", family = "Jain", email = "jjain@nygenome.org", role = "ctb", comment = c(ORCID = "0000-0002-9478-5018")),
18+
person(given = "Longda", family = "Jiang", email = "ljiang@nygenome.org", role = "ctb", comment = c(ORCID = "0000-0003-4964-6497")),
1619
person(given = "Madeline", family = "Kowalski", email = "mkowalski@nygenome.org", role = "ctb", comment = c(ORCID = "0000-0002-5655-7620")),
20+
person(given = "Skylar", family = "Li", email = "sli@nygenome.org", role = "ctb"),
21+
person(given = "Gesmira", family = "Molla", email = 'gmolla@nygenome.org', role = 'ctb', comment = c(ORCID = '0000-0002-8628-5056')),
1722
person(given = "Efthymia", family = "Papalexi", email = "epapalexi@nygenome.org", role = "ctb", comment = c(ORCID = "0000-0001-5898-694X")),
1823
person(given = "Patrick", family = "Roelli", email = "proelli@nygenome.org", role = "ctb"),
19-
person(given = "Rahul", family = "Satija", email = "rsatija@nygenome.org", role = "ctb", comment = c(ORCID = "0000-0001-9448-8833")),
24+
person(given = "Rahul", family = "Satija", email = "seurat@nygenome.org", role = c("aut", "cre"), comment = c(ORCID = "0000-0001-9448-8833")),
2025
person(given = "Karthik", family = "Shekhar", email = "kshekhar@berkeley.edu", role = "ctb"),
2126
person(given = "Avi", family = "Srivastava", email = "asrivastava@nygenome.org", role = "ctb", comment = c(ORCID = "0000-0001-9798-2079")),
2227
person(given = "Tim", family = "Stuart", email = "tstuart@nygenome.org", role = "ctb", comment = c(ORCID = "0000-0002-3044-0897")),
@@ -26,15 +31,19 @@ Authors@R: c(
2631
)
2732
URL: https://satijalab.org/seurat, https://github.com/satijalab/seurat
2833
BugReports: https://github.com/satijalab/seurat/issues
34+
Additional_repositories: https://satijalab.r-universe.dev, https://bnprks.r-universe.dev
2935
Depends:
3036
R (>= 4.0.0),
31-
methods
37+
methods,
38+
SeuratObject (>= 5.0.2)
3239
Imports:
3340
cluster,
3441
cowplot,
42+
fastDummies,
3543
fitdistrplus,
3644
future,
3745
future.apply,
46+
generics (>= 0.1.3),
3847
ggplot2 (>= 3.3.0),
3948
ggrepel,
4049
ggridges,
@@ -48,6 +57,7 @@ Imports:
4857
jsonlite,
4958
KernSmooth,
5059
leiden (>= 0.3.1),
60+
lifecycle,
5161
lmtest,
5262
MASS,
5363
Matrix (>= 1.5-0),
@@ -58,26 +68,28 @@ Imports:
5868
plotly (>= 4.9.0),
5969
png,
6070
progressr,
71+
purrr,
6172
RANN,
6273
RColorBrewer,
6374
Rcpp (>= 1.0.7),
6475
RcppAnnoy (>= 0.0.18),
76+
RcppHNSW,
6577
reticulate,
6678
rlang,
6779
ROCR,
80+
RSpectra,
6881
Rtsne,
6982
scales,
70-
scattermore (>= 0.7),
71-
sctransform (>= 0.3.5),
72-
SeuratObject (>= 4.1.3),
83+
scattermore (>= 1.2),
84+
sctransform (>= 0.4.1),
7385
shiny,
7486
spatstat.explore,
7587
spatstat.geom,
7688
stats,
7789
tibble,
7890
tools,
7991
utils,
80-
uwot (>= 0.1.14)
92+
uwot (>= 0.1.10)
8193
LinkingTo: Rcpp (>= 0.11.0), RcppEigen, RcppProgress
8294
License: MIT + file LICENSE
8395
LazyData: true
@@ -92,16 +104,22 @@ Collate:
92104
'differential_expression.R'
93105
'dimensional_reduction.R'
94106
'integration.R'
107+
'zzz.R'
108+
'integration5.R'
95109
'mixscape.R'
96110
'objects.R'
97111
'preprocessing.R'
112+
'preprocessing5.R'
113+
'roxygen.R'
114+
'sketching.R'
98115
'tree.R'
99116
'utilities.R'
100-
'zzz.R'
101-
RoxygenNote: 7.2.2
117+
RoxygenNote: 7.3.2
102118
Encoding: UTF-8
103119
Suggests:
104120
ape,
121+
arrow,
122+
BPCells,
105123
rsvd,
106124
testthat,
107125
hdf5r,
@@ -125,4 +143,7 @@ Suggests:
125143
mixtools,
126144
ggrastr,
127145
data.table,
128-
R.utils
146+
R.utils,
147+
presto,
148+
DelayedArray,
149+
harmony

0 commit comments

Comments
 (0)