diff --git a/.gitattributes b/.gitattributes index 74d81cc..aec0803 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,5 @@ *.smk linguist-language=Python Snakefile linguist-language=Python +# GitHub syntax highlighting +pixi.lock linguist-language=YAML + diff --git a/.gitignore b/.gitignore index dc99f10..399a6f0 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,6 @@ config/samples.tsv workflow/scripts/misc .test/workflow/scripts/ .ipynb_checkpoints -workflow/scripts/snpEff \ No newline at end of file +workflow/scripts/snpEff# pixi environments +.pixi + diff --git a/.test/config/config_paired_end.yaml b/.test/config/config_paired_end.yaml index 4cf72c3..3b54b05 100644 --- a/.test/config/config_paired_end.yaml +++ b/.test/config/config_paired_end.yaml @@ -1,5 +1,6 @@ metadata: config/samples.tsv pipeline: cpu +parabricks-docker-user: 1006:1006 # only if using parabricks pipeline at LSTM, otherwise ignore # Dataset name dataset: 'Test-GithubActionsCI' @@ -47,7 +48,7 @@ DifferentialExpression: # Activate differential expression gene-level: activate: True isoform-level: - activate: False + activate: True progressiveGenes: activate: True diff --git a/.test/config/config_single_end.yaml b/.test/config/config_single_end.yaml index 8da2aae..65553a6 100644 --- a/.test/config/config_single_end.yaml +++ b/.test/config/config_single_end.yaml @@ -1,5 +1,6 @@ metadata: config/samples.tsv pipeline: cpu +parabricks-docker-user: 1006:1006 # only if using parabricks pipeline at LSTM, otherwise ignore # Dataset name dataset: 'Test-GithubActionsCI' diff --git a/config/exampleconfig.yaml b/config/exampleconfig.yaml index a854f12..e28709e 100755 --- a/config/exampleconfig.yaml +++ b/config/exampleconfig.yaml @@ -1,6 +1,7 @@ # RNA-Seq-Pop -pipeline: parabricks #parabricks or cpu metadata: config/samples.tsv # samplesheet metadata file +pipeline: cpu # parabricks or cpu +parabricks-docker-user: 1006:1006 # only if using parabricks pipeline at LSTM, otherwise ignore dataset: 'Ag_Bouake' # Dataset name: Can be anything, will be used to name some main output files diff --git a/workflow/envs/sleuth.yaml b/workflow/envs/sleuth.yaml index 695a6fb..92e5763 100644 --- a/workflow/envs/sleuth.yaml +++ b/workflow/envs/sleuth.yaml @@ -3,12 +3,11 @@ channels: - r - bioconda dependencies: - - "r-base>=4.0.0" - - "r-sleuth=0.30" - - "r-tidyverse=1.3.1" - - "r-data.table=1.14.0" - - "r-ggrepel=0.9.1" - - "r-openxlsx=4.2.3" - - "r-glue=1.4.2" - - "r-rcolorbrewer=1.1_2" - - "bioconductor-enhancedvolcano=1.8.0" + - r-base + - "r-sleuth=0.30.1" + - r-tidyverse + - r-data.table + - r-ggrepel + - r-openxlsx + - r-glue + - r-rcolorbrewer \ No newline at end of file diff --git a/workflow/rules/star-haplotypecaller.smk b/workflow/rules/star-haplotypecaller.smk index ad2117e..9cfc80c 100644 --- a/workflow/rules/star-haplotypecaller.smk +++ b/workflow/rules/star-haplotypecaller.smk @@ -44,10 +44,11 @@ rule fq2bam: resources: all_gpus = 1 params: - wkdir=wkdir + wkdir=wkdir, + docker_user = config['parabricks-docker-user'] shell: """ - docker run --user 1006:1006 --rm --gpus all --volume {wkdir}:/workdir --workdir /workdir nvcr.io/nvidia/clara/clara-parabricks:4.3.0-1 \ + docker run --user {params.docker_user} --rm --gpus all --volume {wkdir}:/workdir --workdir /workdir nvcr.io/nvidia/clara/clara-parabricks:4.3.0-1 \ pbrun rna_fq2bam \ --in-fq /workdir/{input.reads[0]} /workdir/{input.reads[1]} \ --genome-lib-dir /workdir/resources/reference/star_index\ @@ -75,10 +76,11 @@ rule haplotype_caller: all_gpus = 1 params: wkdir=wkdir, + docker_user = config['parabricks-docker-user'], ploidy=config['VariantAnalysis']['ploidy'] shell: """ - docker run --user 1006:1006 --rm --gpus all --volume {wkdir}:/workdir -w /workdir nvcr.io/nvidia/clara/clara-parabricks:4.3.0-1 \ + docker run --user {params.docker_user} --rm --gpus all --volume {wkdir}:/workdir -w /workdir nvcr.io/nvidia/clara/clara-parabricks:4.3.0-1 \ pbrun haplotypecaller \ --rna \ --ref /workdir/{input.ref_fasta} \ diff --git a/workflow/scripts/SleuthIsoformsDE.R b/workflow/scripts/SleuthIsoformsDE.R index b0befa0..a339053 100644 --- a/workflow/scripts/SleuthIsoformsDE.R +++ b/workflow/scripts/SleuthIsoformsDE.R @@ -15,7 +15,6 @@ library(ggrepel) library(openxlsx) library(glue) library(RColorBrewer) -library(EnhancedVolcano) print("------------- Kallisto - Sleuth - RNASeq isoform Differential expression ---------") #### read data #### @@ -87,13 +86,6 @@ for (cont in contrasts){ labels = results %>% dplyr::mutate("Gene_name" = case_when(GeneName == "" ~ TranscriptID, is.na(GeneName) ~ TranscriptID, TRUE ~ GeneName)) %>% select(Gene_name) %>% deframe() - pdf(glue("results/isoformdiff/Volcano_plot_{cont}.pdf")) - print(EnhancedVolcano(results_list[[cont]], - lab=labels, - x='b', - y='pval', - title = cont)) - garbage = dev.off() print(glue("{cont} complete!")) }