Skip to content

Commit a6a5059

Browse files
author
Aleksandr Popov
authored
Merge pull request #233 from immunomind/dev
2 parents 75b7ece + fb3c4e1 commit a6a5059

Some content is hidden

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

42 files changed

+2324
-252
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ src/*.dll
99
*.DS_Store
1010
docs/*
1111
.idea/*
12+
vignettes/web_only/*.html

DESCRIPTION

+15-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
Package: immunarch
22
Type: Package
33
Title: Bioinformatics Analysis of T-Cell and B-Cell Immune Repertoires
4-
Version: 0.6.7
4+
Version: 0.6.8
55
Authors@R: c(
66
person("Vadim I.", "Nazarov", , "[email protected]", c("aut", "cre")),
77
person("Vasily O.", "Tsvetkov", , role = "aut"),
88
person("Eugene", "Rumynskiy", , role = "aut"),
99
person("Aleksandr A.", "Popov", , role = "aut"),
1010
person("Ivan", "Balashov", , role = "aut"),
11+
person("Maria", "Volobueva", , role = "aut"),
1112
person("Anna", "Lorenc", , role = "ctb"),
1213
person("Daniel J.", "Moore", , role = "ctb"),
1314
person("Victor", "Greiff", , role = "ctb"),
@@ -48,13 +49,23 @@ Imports:
4849
ggpubr (>= 0.2),
4950
rlang (>= 0.4),
5051
plyr,
51-
dbplyr (>= 1.4.0),
52+
purrr,
53+
stringdist,
5254
jsonlite,
5355
readr,
5456
stringr,
5557
tibble,
5658
tidyselect,
57-
purrr
59+
tidyr,
60+
igraph,
61+
ape,
62+
doParallel,
63+
rlist,
64+
utils,
65+
glue,
66+
phangorn,
67+
uuid,
68+
stringi
5869
Depends:
5970
R (>= 4.0.0),
6071
ggplot2 (>= 3.1.0),
@@ -74,3 +85,4 @@ VignetteBuilder: knitr
7485
Encoding: UTF-8
7586
RoxygenNote: 7.1.2
7687
LazyData: true
88+
LazyDataCompression: xz

Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ FROM r-base
44
RUN apt-get update && apt-get install -y --no-install-recommends \
55
build-essential file libcurl4-openssl-dev libcairo2-dev libxml2-dev libssl-dev \
66
libharfbuzz-dev libfribidi-dev libfreetype6-dev libpng-dev libtiff5-dev libjpeg-dev \
7+
libnlopt-dev muscle phylip \
78
&& rm -rf /var/lib/apt/lists/*
89

910
# Install R dependencies
@@ -17,3 +18,6 @@ RUN R -e "remotes::install_local('/immunarch-src', dependencies=TRUE)"
1718

1819
# Delete Immunarch source from the image
1920
RUN rm -rf /immunarch-src
21+
22+
# Check the image for Immunarch existence; fail if Immunarch not found
23+
RUN R -e 'library("immunarch")'

NAMESPACE

+50
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,22 @@ export(publicRepertoire)
7575
export(publicRepertoireApply)
7676
export(publicRepertoireFilter)
7777
export(public_matrix)
78+
export(repAlignLineage)
79+
export(repClonalFamily)
7880
export(repClonality)
7981
export(repDiversity)
8082
export(repExplore)
8183
export(repFilter)
84+
export(repGermline)
8285
export(repLoad)
8386
export(repOverlap)
8487
export(repOverlapAnalysis)
8588
export(repSample)
8689
export(repSave)
8790
export(select_barcodes)
8891
export(select_clusters)
92+
export(seqCluster)
93+
export(seqDist)
8994
export(spectratype)
9095
export(split_to_kmers)
9196
export(top)
@@ -105,32 +110,43 @@ importFrom(Rcpp,cppFunction)
105110
importFrom(Rcpp,sourceCpp)
106111
importFrom(UpSetR,fromExpression)
107112
importFrom(UpSetR,upset)
113+
importFrom(ape,as.DNAbin)
114+
importFrom(ape,muscle)
115+
importFrom(ape,read.tree)
108116
importFrom(circlize,chordDiagram)
109117
importFrom(data.table,":=")
110118
importFrom(data.table,as.data.table)
111119
importFrom(data.table,data.table)
120+
importFrom(data.table,fread)
112121
importFrom(data.table,melt.data.table)
113122
importFrom(data.table,set)
114123
importFrom(data.table,setDF)
115124
importFrom(data.table,setDT)
116125
importFrom(data.table,setcolorder)
117126
importFrom(data.table,setnames)
127+
importFrom(doParallel,registerDoParallel)
118128
importFrom(dplyr,arrange)
119129
importFrom(dplyr,as_tibble)
120130
importFrom(dplyr,collect)
121131
importFrom(dplyr,contains)
132+
importFrom(dplyr,cur_group_id)
122133
importFrom(dplyr,desc)
123134
importFrom(dplyr,distinct)
124135
importFrom(dplyr,filter)
125136
importFrom(dplyr,first)
126137
importFrom(dplyr,full_join)
127138
importFrom(dplyr,group_by)
128139
importFrom(dplyr,group_by_at)
140+
importFrom(dplyr,group_keys)
141+
importFrom(dplyr,group_map)
142+
importFrom(dplyr,left_join)
129143
importFrom(dplyr,mutate)
130144
importFrom(dplyr,n)
131145
importFrom(dplyr,pull)
132146
importFrom(dplyr,rename)
147+
importFrom(dplyr,rowwise)
133148
importFrom(dplyr,select)
149+
importFrom(dplyr,select_if)
134150
importFrom(dplyr,summarise)
135151
importFrom(dplyr,tally)
136152
importFrom(dplyr,top_n)
@@ -152,19 +168,38 @@ importFrom(ggpubr,stat_compare_means)
152168
importFrom(ggpubr,theme_pubr)
153169
importFrom(ggseqlogo,geom_logo)
154170
importFrom(ggseqlogo,theme_logo)
171+
importFrom(glue,glue)
155172
importFrom(grDevices,colorRampPalette)
156173
importFrom(graphics,plot)
157174
importFrom(grid,gpar)
158175
importFrom(grid,rectGrob)
176+
importFrom(igraph,clusters)
177+
importFrom(igraph,graph_from_data_frame)
159178
importFrom(jsonlite,read_json)
160179
importFrom(magrittr,"%<>%")
161180
importFrom(magrittr,"%>%")
181+
importFrom(magrittr,extract2)
182+
importFrom(magrittr,set_attr)
162183
importFrom(methods,as)
184+
importFrom(parallel,detectCores)
185+
importFrom(parallel,mclapply)
163186
importFrom(patchwork,plot_annotation)
164187
importFrom(patchwork,wrap_plots)
188+
importFrom(phangorn,write.phyDat)
165189
importFrom(pheatmap,pheatmap)
190+
importFrom(plyr,.)
191+
importFrom(plyr,dlply)
166192
importFrom(plyr,mapvalues)
193+
importFrom(purrr,imap)
167194
importFrom(purrr,map)
195+
importFrom(purrr,map2)
196+
importFrom(purrr,map2_chr)
197+
importFrom(purrr,map2_lgl)
198+
importFrom(purrr,map_chr)
199+
importFrom(purrr,map_df)
200+
importFrom(purrr,map_dfr)
201+
importFrom(purrr,map_lgl)
202+
importFrom(purrr,pmap)
168203
importFrom(readr,col_character)
169204
importFrom(readr,col_double)
170205
importFrom(readr,col_guess)
@@ -178,6 +213,7 @@ importFrom(readr,write_lines)
178213
importFrom(readxl,read_xlsx)
179214
importFrom(reshape2,melt)
180215
importFrom(rlang,sym)
216+
importFrom(rlist,list.remove)
181217
importFrom(scales,percent)
182218
importFrom(shiny,actionButton)
183219
importFrom(shiny,br)
@@ -216,18 +252,32 @@ importFrom(stats,na.omit)
216252
importFrom(stats,prcomp)
217253
importFrom(stats,qnorm)
218254
importFrom(stats,rmultinom)
255+
importFrom(stringdist,stringdistmatrix)
256+
importFrom(stringi,stri_replace_all_fixed)
257+
importFrom(stringr,boundary)
258+
importFrom(stringr,fixed)
219259
importFrom(stringr,str_count)
220260
importFrom(stringr,str_detect)
261+
importFrom(stringr,str_extract_all)
262+
importFrom(stringr,str_length)
263+
importFrom(stringr,str_match)
221264
importFrom(stringr,str_order)
265+
importFrom(stringr,str_replace)
222266
importFrom(stringr,str_replace_all)
223267
importFrom(stringr,str_sort)
224268
importFrom(stringr,str_split)
269+
importFrom(stringr,str_sub)
225270
importFrom(stringr,str_trim)
271+
importFrom(tibble,rownames_to_column)
226272
importFrom(tibble,tibble)
273+
importFrom(tidyr,unite)
227274
importFrom(tidyselect,starts_with)
275+
importFrom(utils,capture.output)
228276
importFrom(utils,packageVersion)
229277
importFrom(utils,read.table)
230278
importFrom(utils,setTxtProgressBar)
279+
importFrom(utils,str)
231280
importFrom(utils,tail)
232281
importFrom(utils,txtProgressBar)
282+
importFrom(uuid,UUIDgenerate)
233283
useDynLib(immunarch, .registration = TRUE)

0 commit comments

Comments
 (0)