Merge pull request #81 from uab-cgds-worthey/joss_manuscript

Bring master branch up to date

.github/pull_request_template.md

@@ -1,14 +1,20 @@
 # Pull request
 
-Please fill in the checklist below and comment as needed.
+**Please add a clear description of what the PR is about:**
+
+------
+
+**Please fill in the checklist below and comment as needed:**
 
 - [ ] Was code modified? Briefly describe.
 - [ ] Was documentation modified? Briefly describe.
 - [ ] Is this a bug-fix? Briefly describe.
 - [ ] Is this a feature addition? Briefly describe.
 - [ ] Did you modify QuaC-Watch config file? If so, did you modify multiqc template
   `configs/multiqc_config_template.jinja2` and script `src/quac_watch/create_mutliqc_configs.py` as necessary?
-- [ ] Did you perform system-level testing manually as described in master readme doc? Did it pass completely? If not why?
+- [ ] Did you perform system-level testing manually, using `----cli_cluster_config` and `--snakemake_cluster_config`
+  options, as described in the [documentation](https://quac.readthedocs.io/en/stable/system_testing/)? Did it pass
+  completely? If not why?
 - [ ] Updated `Changelog.md` file with change logs in recommended format?
 
 

.github/workflows/action.yml

@@ -4,7 +4,7 @@ on: push
 
 jobs:
   markdown-link-check:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@master
       - uses: gaurav-nelson/github-action-markdown-link-check@v1

.github/workflows/draft-pdf.yml

@@ -0,0 +1,23 @@
+on: [push]
+
+jobs:
+  paper:
+    runs-on: ubuntu-latest
+    name: Paper Draft
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Build draft PDF
+        uses: openjournals/openjournals-draft-action@master
+        with:
+          journal: joss
+          # This should be the path to the paper within your repo.
+          paper-path: paper/paper.md
+      - name: Upload
+        uses: actions/upload-artifact@v1
+        with:
+          name: paper
+          # This is the output path where Pandoc will write the compiled
+          # PDF. Note, this should be the same directory as the input
+          # paper.md
+          path: paper/paper.pdf

.github/workflows/system_testing.yml

@@ -0,0 +1,121 @@
+name: system_testing
+on:
+  # push:
+  #   paths:
+  #     - ".github/workflows/system_testing.yml"
+  #     - ".test/**"
+  #     - "configs/**"
+  #     - "src/**"
+  #     - "workflow/**"
+  workflow_dispatch:
+
+jobs:
+  system-testing:
+    name: System testing - QuaC
+    runs-on: ubuntu-20.04
+    defaults:
+      run:
+        shell: bash -l {0}
+
+    steps:
+      - name: Frees Disk Space (Ubuntu)
+        # For more info about this task, see https://github.com/uab-cgds-worthey/quac/issues/78
+        uses: jlumbroso/free-disk-space@v1.2.0
+        with:
+          # this might remove tools that are actually needed, when set to "true"
+          tool-cache: true
+
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Create quac environment
+        uses: conda-incubator/setup-miniconda@v2
+        with:
+          mamba-version: "*"
+          channels: conda-forge,bioconda,defaults
+          auto-activate-base: false
+          activate-environment: quac
+          environment-file: configs/env/quac.yaml
+
+      - name: Check conda solution
+        run: |
+          mamba env export
+
+      - name: Check snakemake exists in conda env
+        run: |
+          which snakemake
+          snakemake --version
+
+      - uses: eWaterCycle/setup-singularity@v7
+        with:
+          singularity-version: 3.8.3
+
+      - name: Check singularity is working
+        run: |
+          singularity  --version
+
+      - name: Set up dependencies for QuaC
+        run: |
+          bash src/setup_dependency_datasets.sh
+
+      - name: Run QuaC system testing - WGS mode AND no prior QC data
+        run: |
+          PROJECT_CONFIG="project_2samples"
+          PRIOR_QC_STATUS="no_priorQC"
+          USE_SLURM=""
+          python src/run_quac.py \
+                --project_name test_project \
+                --projects_path ".test/ngs-data/" \
+                --pedigree ".test/configs/${PRIOR_QC_STATUS}/${PROJECT_CONFIG}.ped" \
+                --outdir "data/quac/results/test_${PROJECT_CONFIG}_wgs-${PRIOR_QC_STATUS}/analysis" \
+                --quac_watch_config "configs/quac_watch/wgs_quac_watch_config.yaml" \
+                --workflow_config "configs/workflow.yaml" \
+                $USE_SLURM
+
+      - name: Run QuaC system testing - Exome mode AND no prior QC data
+        run: |
+          PROJECT_CONFIG="project_2samples"
+          PRIOR_QC_STATUS="no_priorQC"
+          USE_SLURM=""
+          python src/run_quac.py \
+                --project_name test_project \
+                --projects_path ".test/ngs-data/" \
+                --pedigree ".test/configs/${PRIOR_QC_STATUS}/${PROJECT_CONFIG}.ped" \
+                --outdir "data/quac/results/test_${PROJECT_CONFIG}_exome-${PRIOR_QC_STATUS}/analysis" \
+                --quac_watch_config "configs/quac_watch/exome_quac_watch_config.yaml" \
+                --workflow_config "configs/workflow.yaml" \
+                --exome \
+                $USE_SLURM
+
+      - name: Run QuaC system testing - WGS mode AND uses prior QC data
+        run: |
+          PROJECT_CONFIG="project_2samples"
+          PRIOR_QC_STATUS="include_priorQC"
+          USE_SLURM=""
+          python src/run_quac.py \
+                --project_name test_project \
+                --projects_path ".test/ngs-data/" \
+                --pedigree ".test/configs/${PRIOR_QC_STATUS}/${PROJECT_CONFIG}.ped" \
+                --outdir "data/quac/results/test_${PROJECT_CONFIG}_wgs-${PRIOR_QC_STATUS}/analysis" \
+                --quac_watch_config "configs/quac_watch/wgs_quac_watch_config.yaml" \
+                --include_prior_qc \
+                --allow_sample_renaming \
+                --workflow_config "configs/workflow.yaml" \
+                $USE_SLURM
+
+      - name: Run QuaC system testing - Exome mode AND uses prior QC data
+        run: |
+          PROJECT_CONFIG="project_2samples"
+          PRIOR_QC_STATUS="include_priorQC"
+          USE_SLURM=""
+          python src/run_quac.py \
+                --project_name test_project \
+                --projects_path ".test/ngs-data/" \
+                --pedigree ".test/configs/${PRIOR_QC_STATUS}/${PROJECT_CONFIG}.ped" \
+                --outdir "data/quac/results/test_${PROJECT_CONFIG}_exome-${PRIOR_QC_STATUS}/analysis" \
+                --quac_watch_config "configs/quac_watch/exome_quac_watch_config.yaml" \
+                --exome \
+                --include_prior_qc \
+                --allow_sample_renaming \
+                --workflow_config "configs/workflow.yaml" \
+                $USE_SLURM

.gitignore

@@ -86,3 +86,5 @@ logs/
 # .java/fonts dir get created when creating fastqc conda env
 .java/
 
+# data retrieved for sys testing
+.test/dependency_datasets

.test/README.md

@@ -1,4 +1,4 @@
-# Testing
+# System Testing
 
 Input directory structure to QuaC is based on the output directory structure of the [Small variant caller
 pipeline](https://gitlab.rc.uab.edu/center-for-computational-genomics-and-data-science/sciops/pipelines/small_variant_caller_pipeline).

README.md

@@ -1,6 +1,6 @@
 [![Snakemake](https://img.shields.io/badge/snakemake-6.0.5-brightgreen.svg?style=flat)](https://snakemake.readthedocs.io)
 [![ReadTheDocs](https://readthedocs.org/projects/quac/badge/?version=latest)](https://quac.readthedocs.io/en/stable/)
-
+[![DOI](https://zenodo.org/badge/593702083.svg)](https://zenodo.org/badge/latestdoi/593702083)
 
 # QuaC
 

configs/cli_cluster_config.json

@@ -0,0 +1,7 @@
+{
+    "partition": "express",
+    "ntasks": "1",
+    "time": "02:00:00",
+    "cpus-per-task": "1",
+    "mem-per-cpu": "8G"
+}