Skip to content

Commit e1a6c1e

Browse files
authored
Merge pull request #331 from stemangiola/v2
V2
2 parents dcbf659 + 0891175 commit e1a6c1e

File tree

169 files changed

+19124
-24414
lines changed

Some content is hidden

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

169 files changed

+19124
-24414
lines changed

.Rbuildignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
^renv$
2+
^renv\.lock$
13
^.*\.Rproj$
24
^\.Rproj\.user$
35
^vignettes/introduction_cache$
@@ -13,4 +15,7 @@ README.Rmd
1315
.travis.yml
1416
.RData
1517
^\.github$
16-
^_pkgdown.yml
18+
^_pkgdown.yml
19+
^egsea_report*
20+
^vignettes/egsea*
21+
^tests/testthat/egsea*

.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,11 @@ _targets*
2323
.DS_Store
2424
._.DS_Store
2525
counts_SE.rda
26+
R/rotate_dimensions.R
27+
renv/.gitignore
28+
renv/activate.R
29+
renv/settings.json
30+
.Rprofile
31+
tidybulk.Rcheck/*
32+
..Rcheck/*
33+
vignettes/cache/*

DESCRIPTION

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Type: Package
22
Package: tidybulk
33
Title: Brings transcriptomics to the tidyverse
4-
Version: 1.21.1
4+
Version: 1.99.2
55
Authors@R: c(person("Stefano", "Mangiola", email = "[email protected]",
66
role = c("aut", "cre")),
77
person("Maria", "Doyle", email = "[email protected]",
@@ -16,16 +16,13 @@ Depends:
1616
ttservice (>= 0.3.6)
1717
Imports:
1818
tibble,
19-
readr,
2019
dplyr (>= 1.1.0),
2120
magrittr,
2221
tidyr,
23-
stringi,
2422
stringr,
2523
rlang,
2624
purrr,
2725
tidyselect,
28-
preprocessCore,
2926
stats,
3027
parallel,
3128
utils,
@@ -76,6 +73,7 @@ Suggests:
7673
markdown,
7774
uwot,
7875
matrixStats,
76+
preprocessCore,
7977
igraph,
8078
EGSEA,
8179
IRanges,
@@ -86,7 +84,10 @@ Suggests:
8684
lme4,
8785
glmmTMB,
8886
MASS,
89-
pkgconfig
87+
pkgconfig,
88+
enrichplot,
89+
patchwork,
90+
airway
9091
VignetteBuilder:
9192
knitr
9293
RdMacros:

NAMESPACE

Lines changed: 41 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,114 +1,75 @@
11
# Generated by roxygen2: do not edit by hand
22

3-
S3method(arrange,tidybulk)
4-
S3method(bind_cols,tidybulk)
5-
S3method(bind_rows,tidybulk)
6-
S3method(distinct,tidybulk)
7-
S3method(filter,tidybulk)
8-
S3method(full_join,tidybulk)
9-
S3method(group_by,tidybulk)
10-
S3method(inner_join,tidybulk)
11-
S3method(left_join,tidybulk)
12-
S3method(mutate,nested_tidybulk)
13-
S3method(mutate,tidybulk)
14-
S3method(nest,tidybulk)
15-
S3method(rename,tidybulk)
16-
S3method(right_join,tidybulk)
17-
S3method(rowwise,tidybulk)
18-
S3method(summarise,tidybulk)
19-
S3method(ungroup,tidybulk)
20-
S3method(unnest,nested_tidybulk)
21-
export("%>%")
3+
S3method(tidybulk::filterByExpr,DGEList)
4+
S3method(tidybulk::filterByExpr,default)
5+
S3method(validation,default)
6+
S3method(validation,tidybulk)
227
export(adjust_abundance)
238
export(aggregate_duplicates)
24-
export(arrange)
259
export(as_SummarizedExperiment)
2610
export(as_matrix)
27-
export(as_tibble)
28-
export(bind_cols)
2911
export(cluster_elements)
3012
export(deconvolve_cellularity)
3113
export(describe_transcript)
32-
export(distinct)
33-
export(do)
34-
export(ensembl_to_symbol)
3514
export(fill_missing_abundance)
36-
export(filter)
37-
export(full_join)
3815
export(get_bibliography)
39-
export(group_by)
4016
export(identify_abundant)
4117
export(impute_missing_abundance)
42-
export(inner_join)
4318
export(keep_abundant)
4419
export(keep_variable)
45-
export(left_join)
4620
export(log10_reverse_trans)
4721
export(logit_trans)
48-
export(mutate)
49-
export(nest)
5022
export(pivot_sample)
5123
export(pivot_transcript)
5224
export(quantile_normalise_abundance)
5325
export(reduce_dimensions)
5426
export(remove_redundancy)
55-
export(rename)
5627
export(resolve_complete_confounders_of_non_interest)
57-
export(right_join)
5828
export(rotate_dimensions)
59-
export(rowwise)
6029
export(scale_abundance)
61-
export(select)
62-
export(summarise)
63-
export(symbol_to_entrez)
6430
export(test_differential_abundance)
65-
export(test_differential_cellularity)
31+
export(test_differential_expression)
6632
export(test_gene_enrichment)
6733
export(test_gene_overrepresentation)
6834
export(test_gene_rank)
69-
export(test_stratification_cellularity)
70-
export(tibble)
71-
export(tidybulk)
72-
export(tidybulk_SAM_BAM)
73-
export(unnest)
7435
exportMethods(as_SummarizedExperiment)
75-
exportMethods(quantile_normalise_abundance)
76-
exportMethods(scale_abundance)
77-
exportMethods(tidybulk)
78-
exportMethods(tidybulk_SAM_BAM)
79-
import(SummarizedExperiment)
8036
import(lifecycle)
81-
import(methods)
82-
import(parallel)
83-
import(preprocessCore)
84-
import(readr)
8537
import(tibble)
8638
importFrom(GenomicRanges,makeGRangesListFromDataFrame)
8739
importFrom(Matrix,colSums)
8840
importFrom(Matrix,rowMeans)
8941
importFrom(Matrix,t)
42+
importFrom(S4Vectors,"metadata<-")
9043
importFrom(S4Vectors,DataFrame)
44+
importFrom(S4Vectors,as.data.frame)
9145
importFrom(S4Vectors,metadata)
46+
importFrom(SummarizedExperiment,"assays<-")
47+
importFrom(SummarizedExperiment,"colData<-")
48+
importFrom(SummarizedExperiment,"rowData<-")
49+
importFrom(SummarizedExperiment,"rowRanges<-")
9250
importFrom(SummarizedExperiment,SummarizedExperiment)
9351
importFrom(SummarizedExperiment,as.data.frame)
52+
importFrom(SummarizedExperiment,assay)
53+
importFrom(SummarizedExperiment,assayNames)
9454
importFrom(SummarizedExperiment,assays)
9555
importFrom(SummarizedExperiment,colData)
56+
importFrom(SummarizedExperiment,colnames)
9657
importFrom(SummarizedExperiment,rowData)
9758
importFrom(SummarizedExperiment,rowRanges)
59+
importFrom(crayon,blue)
9860
importFrom(dplyr,across)
99-
importFrom(dplyr,anti_join)
61+
importFrom(dplyr,add_count)
10062
importFrom(dplyr,arrange)
63+
importFrom(dplyr,as_tibble)
10164
importFrom(dplyr,between)
102-
importFrom(dplyr,contains)
65+
importFrom(dplyr,bind_cols)
66+
importFrom(dplyr,bind_rows)
10367
importFrom(dplyr,count)
68+
importFrom(dplyr,desc)
10469
importFrom(dplyr,distinct)
105-
importFrom(dplyr,do)
10670
importFrom(dplyr,everything)
10771
importFrom(dplyr,filter)
108-
importFrom(dplyr,full_join)
10972
importFrom(dplyr,group_by)
110-
importFrom(dplyr,group_by_drop_default)
111-
importFrom(dplyr,group_cols)
11273
importFrom(dplyr,if_else)
11374
importFrom(dplyr,inner_join)
11475
importFrom(dplyr,join_by)
@@ -119,7 +80,6 @@ importFrom(dplyr,n)
11980
importFrom(dplyr,n_distinct)
12081
importFrom(dplyr,pull)
12182
importFrom(dplyr,rename)
122-
importFrom(dplyr,right_join)
12383
importFrom(dplyr,rowwise)
12484
importFrom(dplyr,select)
12585
importFrom(dplyr,select_if)
@@ -132,35 +92,35 @@ importFrom(dplyr,ungroup)
13292
importFrom(lifecycle,deprecate_soft)
13393
importFrom(lifecycle,deprecate_warn)
13494
importFrom(magrittr,"%$%")
135-
importFrom(magrittr,"%>%")
13695
importFrom(magrittr,divide_by)
13796
importFrom(magrittr,equals)
13897
importFrom(magrittr,extract2)
13998
importFrom(magrittr,multiply_by)
99+
importFrom(magrittr,not)
140100
importFrom(magrittr,set_colnames)
141101
importFrom(magrittr,set_rownames)
102+
importFrom(methods,is)
103+
importFrom(methods,new)
104+
importFrom(methods,slot)
105+
importFrom(parallel,clusterExport)
106+
importFrom(parallel,makeCluster)
142107
importFrom(parallel,mclapply)
143-
importFrom(purrr,as_mapper)
108+
importFrom(parallel,parLapply)
109+
importFrom(parallel,stopCluster)
144110
importFrom(purrr,map)
145111
importFrom(purrr,map2)
146112
importFrom(purrr,map2_dfc)
147113
importFrom(purrr,map2_dfr)
148114
importFrom(purrr,map_chr)
149115
importFrom(purrr,map_dfr)
150116
importFrom(purrr,map_int)
151-
importFrom(purrr,map_lgl)
152117
importFrom(purrr,reduce)
153118
importFrom(purrr,when)
154119
importFrom(rlang,"!!")
155120
importFrom(rlang,":=")
156-
importFrom(rlang,dots_list)
157-
importFrom(rlang,dots_values)
158121
importFrom(rlang,enquo)
159-
importFrom(rlang,enquos)
160-
importFrom(rlang,flatten_if)
161122
importFrom(rlang,inform)
162123
importFrom(rlang,is_quosure)
163-
importFrom(rlang,is_spliced)
164124
importFrom(rlang,quo)
165125
importFrom(rlang,quo_is_missing)
166126
importFrom(rlang,quo_is_null)
@@ -174,11 +134,17 @@ importFrom(scales,extended_breaks)
174134
importFrom(scales,label_scientific)
175135
importFrom(scales,log_breaks)
176136
importFrom(scales,trans_new)
137+
importFrom(stats,AIC)
138+
importFrom(stats,anova)
177139
importFrom(stats,as.formula)
140+
importFrom(stats,coef)
178141
importFrom(stats,cor)
179142
importFrom(stats,cov)
180143
importFrom(stats,dist)
144+
importFrom(stats,hat)
181145
importFrom(stats,kmeans)
146+
importFrom(stats,lm)
147+
importFrom(stats,logLik)
182148
importFrom(stats,lsfit)
183149
importFrom(stats,median)
184150
importFrom(stats,model.matrix)
@@ -187,39 +153,40 @@ importFrom(stats,p.adjust)
187153
importFrom(stats,pchisq)
188154
importFrom(stats,plogis)
189155
importFrom(stats,prcomp)
156+
importFrom(stats,predict)
190157
importFrom(stats,qlogis)
191158
importFrom(stats,rnorm)
192159
importFrom(stats,sd)
193160
importFrom(stats,setNames)
194161
importFrom(stats,terms)
195-
importFrom(stringi,stri_c)
162+
importFrom(stats,update.formula)
163+
importFrom(stats,vcov)
196164
importFrom(stringr,str_c)
197165
importFrom(stringr,str_detect)
198166
importFrom(stringr,str_remove)
199167
importFrom(stringr,str_replace)
200168
importFrom(stringr,str_replace_all)
201-
importFrom(stringr,str_split)
202169
importFrom(stringr,str_subset)
203170
importFrom(tibble,as_tibble)
204171
importFrom(tibble,enframe)
205172
importFrom(tibble,rowid_to_column)
206173
importFrom(tibble,tibble)
207-
importFrom(tidyr,complete)
208174
importFrom(tidyr,drop_na)
209175
importFrom(tidyr,gather)
210176
importFrom(tidyr,nest)
211177
importFrom(tidyr,pivot_longer)
212178
importFrom(tidyr,pivot_wider)
213-
importFrom(tidyr,replace_na)
214179
importFrom(tidyr,spread)
215180
importFrom(tidyr,unite)
216181
importFrom(tidyr,unnest)
182+
importFrom(tidyselect,all_of)
217183
importFrom(tidyselect,any_of)
218-
importFrom(ttservice,bind_cols)
219-
importFrom(ttservice,bind_rows)
184+
importFrom(tidyselect,ends_with)
220185
importFrom(utils,capture.output)
186+
importFrom(utils,combn)
221187
importFrom(utils,data)
222188
importFrom(utils,head)
223189
importFrom(utils,install.packages)
224190
importFrom(utils,packageDescription)
191+
importFrom(utils,packageVersion)
225192
importFrom(utils,tail)

0 commit comments

Comments
 (0)