Skip to content
Snippets Groups Projects
  1. Feb 21, 2020
    • BIOPZ-Katsantoni Maria's avatar
      handle polyA processing in input preparation script · c4e20a21
      BIOPZ-Katsantoni Maria authored and Alex Kanitz's avatar Alex Kanitz committed
      - fixes some functions in `labkey_to_snakemake.py`
      - add optional argument for trimming polyA tails; they are trimmed as follows:
        - if mate is sense, oligo-A is added to sample table for `cutadapt` rule to trim
        - if mate is antisense, oligo-T is added to sample table for `cutadapt` rule to trim
        - if option is set to `--trim_polya`, oligo-X stretch is added to sample table and `cutadapt` will not trim
      c4e20a21
  2. Feb 20, 2020
    • Alex Kanitz's avatar
      Merge branch 'log_dirs' into 'master' · c58f28df
      Alex Kanitz authored
      create log directories in Snakefile
      
      Closes #70
      
      See merge request zavolan_group/pipelines/rnaseqpipeline!28
      c58f28df
    • Alex Kanitz's avatar
      create log directories in Snakefile\ · 5e1ec85e
      Alex Kanitz authored
      - log and, if workflow is executed on cluster, cluster log directories are explicitly created in `Snakefile`
      - location of main log directory can be configured in `config.yaml` (field `log_dir`, previously: `local_log`; requires change in script `labkey_to_snakemake.py` as well as subworkflows as field name is hard-coded there)
      - location of cluster log directory can be configured in `cluster.json` (in field `__default__` -> `out`)
      - `config.yaml` and `cluster.json` in `tests/input_files` are set such that a directory `logs/` is created in the directory where Snakemake is run (i.e., the directory of each test); cluster logs are stored in a subdirectory `logs/cluster`
      - removes instructions to explicitly create log directories from docs and all test scripts
      - cleans up main `Snakefile` (apart from Snakemake-specific syntax, now passes `flake8` linter test)
      5e1ec85e
  3. Feb 18, 2020
    • Alex Kanitz's avatar
      Merge branch 'hotfix_docs_missing_link' into 'master' · 1f933bcc
      Alex Kanitz authored
      fix broken links in docs
      
      See merge request zavolan_group/pipelines/rnaseqpipeline!27
      1f933bcc
    • Alex Kanitz's avatar
      fix broken links in docs · 1782ea86
      Alex Kanitz authored
      1782ea86
    • Alex Kanitz's avatar
      Merge branch 'conda_env' into 'master' · 885c5692
      Alex Kanitz authored
      install dependencies via Conda
      
      Closes #56
      
      See merge request zavolan_group/pipelines/rnaseqpipeline!24
      885c5692
    • Alex Kanitz's avatar
      install dependencies via Conda · 8742cd72
      Alex Kanitz authored
      - add 3 separate Conda environment files for installing
        - essential dependencies without Singularity (most users)
        - essential dependencies including Singularity (root users on Linux only)
        - non-essential dependencies (required for tests etc.)
      - install Python dependencies via `pip` _within_ Conda environment to avoid #56
      - update Conda-based installation instructions
        - describe usage of different environment files
        - add supported OS versions (macOS not yet added, because only installation works)
      - update CI config to use same setup (based on Miniconda Docker image)
      8742cd72
    • Alex Kanitz's avatar
      Merge branch 'verbose_tests' into 'master' · 4ad34d82
      Alex Kanitz authored
      run tests in verbose mode
      
      Closes #68
      
      See merge request zavolan_group/pipelines/rnaseqpipeline!26
      4ad34d82
    • Alex Kanitz's avatar
      run tests in verbose mode · 0d95577e
      Alex Kanitz authored
      - trap call functionalized through cleanup() function
      - function added to all test scripts
      - function prints out exit status of last command before trap
      - flag `--verbose` added to Snakemake calls in all test scripts
      - script tests rename to follow naming convention 'test_script_<script_name>_<script_run_mode>
      0d95577e
  4. Feb 17, 2020
  5. Feb 15, 2020
    • Alex Kanitz's avatar
      Merge branch 'labkey_api_input_parser' into 'master' · a654943c
      Alex Kanitz authored
      get Snakemake input from LabKey API
      
      Closes #47
      
      See merge request zavolan_group/pipelines/rnaseqpipeline!23
      a654943c
    • BIOPZ-Katsantoni Maria's avatar
      get Snakemake input from LabKey API · eea0206f
      BIOPZ-Katsantoni Maria authored and Alex Kanitz's avatar Alex Kanitz committed
      - add script that prepares Snakemake input files 'samples.tsv' and 'config.yaml' from LabKey table
      - script either connects to API directly (with '--remote' and related options) or processes a tab-separated LabKey dump file
      - add tests for both use cases
      - common input files for tests now in 'tests/input_files'
      - update all other tests to account for new file locations
      - update documentation
      eea0206f
  6. Feb 14, 2020
  7. Feb 09, 2020
    • Alex Kanitz's avatar
      Merge branch 'test_files' into 'master' · 7f243c20
      Alex Kanitz authored
      Replace test files with small synthetic ones
      
      See merge request zavolan_group/pipelines/rnaseqpipeline!16
      7f243c20
    • Alex Kanitz's avatar
      replace test files with small synthetic ones · 48e012a0
      Alex Kanitz authored
      - replaces existing larger libraries and annotations in test cases `test_create_dag_chart` and `test_integration_workflow`
      - adds the following new test files:
        - `chr1-10000-20000.fa`: artificial chromosome of length 10'000 (based on human chromosome 1)
        - `chr1-10000-20000.gtf`: matching gene annotation file with two gene and three multi-exon transcripts entries
        - `chr1-10000-20000.transcripts.fa`: sequences of the transcripts listed in the gene annotation file
        - `synthetic.mate_?.fastq.gz`: 10 read pairs randomly sampled from the genic regions of the artificial chromosome
        - `synthetic.*.bed`: BED files with expected alignments for each read; names of overlapping genes are specified in a 7th column
      - updates file paths in the relevant sample tables
      - extends and updates checksum checking of result files in CI/CD pipeline
      48e012a0
  8. Feb 08, 2020
  9. Feb 07, 2020
  10. Feb 04, 2020
    • Alex Kanitz's avatar
      Merge branch 'documentation' into 'master' · a30dc213
      Alex Kanitz authored
      add documentation
      
      See merge request zavolan_group/pipelines/rnaseqpipeline!12
      a30dc213
    • Alex Kanitz's avatar
      add documentation · 1ef8b6af
      Alex Kanitz authored
      `README.md` file describes
      - aim and background of the project (including the workflow DAG representation)
      - how to install requirements (including setting up a `conda` environment for the project)
      - how to execute the workflow run integration test
      - how to run the workflow on your own samples (including how to auto-generate required params from LabKey metadata)
      
      Additional minor changes:
      - minor changes in various test and related files, including updates of paths
      - root directory now includes subdirectory `runs/` for a user's workflow runs (contents not version-controlled)
      1ef8b6af
    • Alex Kanitz's avatar
      Merge branch 'clean_up_tests' into 'master' · 0b15325e
      Alex Kanitz authored
      clean up tests
      
      See merge request zavolan_group/pipelines/rnaseqpipeline!11
      0b15325e
    • Alex Kanitz's avatar
      clean up tests · 6a231363
      Alex Kanitz authored
      - set up integration test for Snakefile in dedicated folder; current test case was left untouched for the time being, despite requiring large input files
      - set up DAG chart creation test in dedicated folder; script creates an SVG representation of the workflow DAG at `images/workflow_dag.svg`
      - both tests have been added to the GitLab CI/CD configuration; the latter test ensures that always the latest version of the
      - all tests are now located inside subdirectories of `tests/`; test scripts and configuration files for test runs etc. have been moved to the appropriate test directories
      - for the time being, required input files for each test are placed within the individual test directories; a layout for common test files should be introduced later and paths and bind paths in tests adapted
      - make script `scripts/labkey_api.py` executable
      6a231363
  11. Feb 03, 2020
    • Alex Kanitz's avatar
      Merge branch 'create_full_input_table' into 'master' · 3d9a272c
      Alex Kanitz authored
      Input parser
      
      Closes #39
      
      See merge request zavolan_group/pipelines/rnaseqpipeline!10
      3d9a272c
    • BIOPZ-Katsantoni Maria's avatar
      generate Snakemake inputs from LabKey data table · cd541afe
      BIOPZ-Katsantoni Maria authored and Alex Kanitz's avatar Alex Kanitz committed
      Adds script `scripts/labkey_to_snakemake.py` which
      - maps LabKey table fields to Snakemake parameters
      - assembles required parameters from the table data
      - infers required parameters from the input data
      - produces files `config.yaml` and `samples.tsv` required by the Snakemake pipeline
      
      A self-contained integration test for the script is located at `tests/test_scripts_labkey_to_snakemake` (execute script `test.sh`) and was added to the CI/CD pipeline.
      
      Note that intermittent changes to the `master` branch were merged into this branch to forego conflicts during merging.
      
      Closes #39
      cd541afe
  12. Jan 24, 2020
Loading