Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev -> master for v1.4.0 #205

Merged
merged 81 commits into from
Nov 27, 2023
Merged
Changes from 1 commit
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
32e135d
Post 1.3.1 release changes
pinin4fjords Oct 27, 2023
ad2e3a2
[automated] Fix linting with Prettier
nf-core-bot Oct 27, 2023
2f65398
Merge pull request #186 from nf-core/post_release_v1.3.1
pinin4fjords Oct 27, 2023
3c53db4
Enabled selecting all genes for exploratory
WackerO Nov 8, 2023
1887890
Add DESeq2 designs to report
WackerO Nov 8, 2023
aaed90f
Fixed GSEA section indent in report
WackerO Nov 8, 2023
c68ded1
Added optional scree plot in report
WackerO Nov 8, 2023
9fad17b
Added some more explanation text about DE to the report
WackerO Nov 8, 2023
7c3824a
Added colors to volcano depending on DE status
WackerO Nov 8, 2023
795f136
bumped nextflowversion
WackerO Nov 8, 2023
a66d795
fix Sample metadata table in the html report is not paginating
davidecarlson Nov 8, 2023
0cf6908
Updated CHANGELOG
davidecarlson Nov 8, 2023
7bf203c
Updated CHANGELOG
davidecarlson Nov 8, 2023
3cbc989
Update CHANGELOG.md
pinin4fjords Nov 8, 2023
d679205
[automated] Fix linting with Prettier
nf-core-bot Nov 8, 2023
5abec26
Merge pull request #195 from davidecarlson/dev
davidecarlson Nov 8, 2023
790ab16
changed remaining instances of NF version
WackerO Nov 9, 2023
4cb13bf
changed example NF version back
WackerO Nov 9, 2023
bbbb8dc
Made min version less strict
WackerO Nov 9, 2023
4cbbad6
Fixed some more version problems, added exploratory_n_features to max…
WackerO Nov 9, 2023
7c7f1de
Update assets/differentialabundance_report.Rmd
WackerO Nov 9, 2023
8c2b7cc
Update assets/differentialabundance_report.Rmd
WackerO Nov 9, 2023
370adbe
Update assets/differentialabundance_report.Rmd
WackerO Nov 9, 2023
9e1f716
removed excessive loop for scree plot, set param to default true
WackerO Nov 9, 2023
4747034
update changelog
WackerO Nov 9, 2023
7a1b74f
Update changelog
WackerO Nov 9, 2023
c929a76
Fix changelog
WackerO Nov 9, 2023
ce7999f
Merge branch 'dev' of https://github.com/nf-core/differentialabundanc…
WackerO Nov 9, 2023
ad9d55d
Merge branch 'dev' into gsea_indent
WackerO Nov 9, 2023
ebda620
Updated changelog and schema, added gene number to cluster plot titles
WackerO Nov 9, 2023
7a2f395
Merge branch 'dev' of https://github.com/nf-core/differentialabundanc…
WackerO Nov 9, 2023
c7a0bbd
added nf version to changelog
WackerO Nov 9, 2023
a9a4341
Update assets/differentialabundance_report.Rmd
WackerO Nov 9, 2023
de51aa5
Update assets/differentialabundance_report.Rmd
WackerO Nov 9, 2023
24a305c
made non-significant points gray
WackerO Nov 9, 2023
fb81da5
Merge branch 'dev' of https://github.com/nf-core/differentialabundanc…
WackerO Nov 9, 2023
a855f05
Updated changelog
WackerO Nov 9, 2023
d2ce1d6
Merge branch 'dev' of https://github.com/nf-core/differentialabundanc…
WackerO Nov 9, 2023
95b39bf
Merge pull request #190 from WackerO/gsea_indent
WackerO Nov 13, 2023
14e89bc
Merge pull request #192 from WackerO/scree
WackerO Nov 13, 2023
6e43558
Merge branch 'dev' of https://github.com/nf-core/differentialabundanc…
WackerO Nov 13, 2023
9a11027
Merge branch 'dev' of https://github.com/nf-core/differentialabundanc…
WackerO Nov 13, 2023
8f9a70c
Merge pull request #188 from WackerO/allgenes
WackerO Nov 13, 2023
0d446ac
Merge pull request #193 from WackerO/deseq_text
WackerO Nov 14, 2023
427564b
Merge branch 'dev' of https://github.com/nf-core/differentialabundanc…
WackerO Nov 14, 2023
698a5b9
Update assets/differentialabundance_report.Rmd
WackerO Nov 16, 2023
01fcc71
Merge pull request #194 from WackerO/volcano
WackerO Nov 16, 2023
1e72670
Document correct rnaseq matrix usage
pinin4fjords Nov 20, 2023
a0cc980
update changelog
pinin4fjords Nov 20, 2023
f237ec9
Update CHANGELOG.md
pinin4fjords Nov 20, 2023
2df703d
Update deseq2/limma
WackerO Nov 20, 2023
408e31e
Updated soft config
WackerO Nov 20, 2023
90eb2c6
Update CHANGELOG.md
pinin4fjords Nov 20, 2023
3fe629b
Updated changelog and maxquant config
WackerO Nov 20, 2023
2e44c27
Updated affy config
WackerO Nov 20, 2023
bba14c3
Merge pull request #200 from nf-core/rnaseq_matrix_docs
pinin4fjords Nov 20, 2023
d13dda1
remove issue from changelog
WackerO Nov 21, 2023
a722931
Merge branch 'dev' of https://github.com/nf-core/differentialabundanc…
WackerO Nov 21, 2023
03857ea
Update CHANGELOG.md
pinin4fjords Nov 21, 2023
df55a09
Merge pull request #201 from WackerO/mod_updates
WackerO Nov 21, 2023
1babd7d
Merge branch 'dev' of https://github.com/nf-core/differentialabundanc…
WackerO Nov 21, 2023
ea326ae
Model is now added to report from the model output files
WackerO Nov 21, 2023
b86fbdc
Made deseq script like the one in dev
WackerO Nov 21, 2023
8d5ea35
Update changelog
WackerO Nov 21, 2023
4587680
Merge pull request #189 from WackerO/design
WackerO Nov 22, 2023
751dc98
Update docs
pinin4fjords Nov 22, 2023
4299142
Plumb in the new gene length matrices
pinin4fjords Nov 22, 2023
330824e
[automated] Fix linting with Prettier
nf-core-bot Nov 22, 2023
e5469e3
Bump deseq2
pinin4fjords Nov 22, 2023
da6f202
Merge branch 'transcript_lengths' of github.com:nf-core/differentiala…
pinin4fjords Nov 22, 2023
1a698cc
add transcript lengths to test config
pinin4fjords Nov 22, 2023
8c8bd91
[skip ci] update CHANGELOG
pinin4fjords Nov 22, 2023
aabb13b
Install deseq from master again
pinin4fjords Nov 22, 2023
9bf5396
Schema fix
pinin4fjords Nov 22, 2023
0b9aeeb
Merge pull request #203 from nf-core/transcript_lengths
pinin4fjords Nov 22, 2023
77614e6
bump versions to 1.4.0
pinin4fjords Nov 25, 2023
4db0bc3
Poke CI
pinin4fjords Nov 25, 2023
40073de
Merge pull request #204 from nf-core/release_v1.4.0
pinin4fjords Nov 25, 2023
56853f5
Address @mashehu feedback for release
pinin4fjords Nov 27, 2023
2341fbd
Poke CI
pinin4fjords Nov 27, 2023
47ef421
Merge pull request #206 from nf-core/v1.4.0_fixes
pinin4fjords Nov 27, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added optional scree plot in report
WackerO committed Nov 8, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit c68ded1cc82d5b7e98ea50bc0b74c472a5fe1df8
32 changes: 30 additions & 2 deletions assets/differentialabundance_report.Rmd
Original file line number Diff line number Diff line change
@@ -24,6 +24,7 @@ params:
report_title: NULL,
report_author: NULL,
report_description: NULL,
report_scree: NULL
observations_type: NULL
observations: NULL # GSE156533.samplesheet.csv
observations_id_col: NULL
@@ -495,10 +496,12 @@ cat(paste0("\n### ", ucfirst(params$observations_type), " relationships\n"))
Principal components analysis was conducted based on the `r params$exploratory_n_features` most variable `r params$features_type`s. Each component was annotated with its percent contribution to variance.

```{r, echo=FALSE, results='asis'}
# Create nested list to save the percentVars for reusing in the scree plot
percentVar_list <- list()
for (assay_type in rev(names(assay_data))){

pca_data <- pca_datas[[assay_type]]

percentVar_list[[assay_type]] <- list()
for (iv in informative_variables){

cat(paste0("\n##### ", prettifyVariablename(assay_type), " (", iv, ")\n"))
@@ -543,6 +546,31 @@ for (assay_type in rev(names(assay_data))){

print(htmltools::tagList(do.call("plotly_scatterplot", plot_args)))
}
percentVar_list[[assay_type]][[iv]] <- percentVar
}
}
```

```{r, echo=FALSE, results='asis', eval=params$report_scree}
cat(paste0("\n#### Scree plot {.tabset}"))
cat(paste0("\nThe following scree plot visualizes what percentage of total variation in the data can be explained by each of the principal components computed.\n"))

for (assay_type in names(percentVar_list)) {
for (iv in names(percentVar_list[[assay_type]])) {
percentVarData <- data.frame(percentVar_list[[assay_type]][[iv]])
colnames(percentVarData) <- c("var_explained")
percentVarData$PCA <- as.numeric(rownames(percentVarData))
write.table(percentVarData, file=paste0("/home-link/iivow01/git/save_differentialabundance/error/", assay_type, "_", iv, "_varex.tsv"), quote=F, sep="\t")
cat(paste0("\n##### ", prettifyVariablename(assay_type), " (", iv, ")\n"))
print(
ggplot(percentVarData, aes(x=factor(PCA),y=var_explained, group=1)) +
theme_bw() +
geom_point(size=4) +
geom_line(linetype="dashed") +
xlab("PC") +
ylab("Percent variance explained")
)
cat("\n")
}
}
```
@@ -902,4 +930,4 @@ print( htmltools::tagList(datatable(versions_table, caption = "Software versions

```{r, echo=FALSE, results='asis'}
htmltools::includeMarkdown(params$citations)
```
```
1 change: 1 addition & 0 deletions nextflow.config
Original file line number Diff line number Diff line change
@@ -28,6 +28,7 @@ params {
report_title = null
report_author = null
report_description = null
report_scree = false

// Sample sheet options
observations_type = 'sample'
5 changes: 5 additions & 0 deletions nextflow_schema.json
Original file line number Diff line number Diff line change
@@ -952,6 +952,11 @@
"default": "None",
"fa_icon": "fas fa-feather",
"description": "A description for reporting outputs"
},
"report_scree": {
"type": "boolean",
"default": "false",
"description": "Whether to generate a scree plot in the report"
}
},
"required": ["report_file", "logo_file", "css_file"]