Skip to content

Commit

Permalink
Merge pull request #366 from jfy133/dev
Browse files Browse the repository at this point in the history
Changes from PR review
  • Loading branch information
jfy133 authored Mar 5, 2020
2 parents c9b71e6 + 17acbaa commit ecdbdf9
Show file tree
Hide file tree
Showing 8 changed files with 145 additions and 145 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ A clear and concise description of what you expected to happen.
## Container engine

- Engine: <!-- [e.g. Conda, Docker or Singularity] -->
- version: <!-- [e.g. 1.0.0] -->
- Image tag: <!-- [e.g. nfcore/eager:1.0.0] -->
- version: <!-- [e.g. 2.1.0] -->
- Image tag: <!-- [e.g. nfcore/eager:2.1.0] -->

## Additional context

Expand Down
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ These are the most common things requested on pull requests (PRs).
- [ ] This comment contains a description of changes (with reason)
- [ ] If you've fixed a bug or added code that should be tested, add tests!
- [ ] If necessary, also make a PR on the [nf-core/eager branch on the nf-core/test-datasets repo](https://github.com/nf-core/test-datasets/pull/new/nf-core/eager)
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker`).
- [ ] Make sure your code lints (`nf-core lint .`).
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker --paired_end`).
- [ ] Make sure your code lints ([`nf-core lint .`](https://nf-co.re/tools)).
- [ ] Documentation in `docs` is updated
- [ ] `CHANGELOG.md` is updated
- [ ] `README.md` is updated
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
docker tag nfcore/eager:dev nfcore/eager:2.1.0
- name: BASIC Run the basic pipeline with the test profileBasic workflow, PE/SE, bwa aln
run: |
nextflow run ${GITHUB_WORKSPACE} -profile test,docker ${{ matrix.endedness }} --saveReference
nextflow run ${GITHUB_WORKSPACE} -profile test,docker ${{ matrix.endedness }} --save_reference
- name: REFERENCE Basic workflow, with supplied indices
run: |
nextflow run ${GITHUB_WORKSPACE} -profile test,docker ${{ matrix.endedness }} --bwa_index 'results/reference_genome/bwa_index/BWAIndex/Mammoth_MT_Krause.fasta' --fasta_index 'https://github.com/nf-core/test-datasets/blob/eager/reference/Mammoth/Mammoth_MT_Krause.fasta.fai'
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [dev]
## [2.1.0] - Ravensburg - 2020-03-05

### `Added`

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Additional functionality contained by the pipeline currently includes:
#### aDNA Damage manipulation

* Damage removal/clipping for UDG+/UDG-half treatment protocols (`BamUtil`)
* Damage reads extraction and assessment (`PMDTools`)
* Damaged reads extraction and assessment (`PMDTools`)

#### Genotyping

Expand Down
12 changes: 6 additions & 6 deletions docs/usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* [`-w / -work-dir`](#-w---work-dir)
* [Optional Reference Options](#optional-reference-options)
* [`--large_ref`](#--large_ref)
* [`--saveReference`](#--savereference)
* [`--save_reference`](#--save_reference)
* [`--bwa_index`](#--bwa_index)
* [`--seq_dict`](#--seq_dict)
* [`--fasta_index`](#--fasta_index)
Expand Down Expand Up @@ -374,7 +374,7 @@ For example:
--fasta '/<path>/<to>/my_reference.fasta'
```

> If you don't specify appropriate `--bwa_index`, `--fasta_index` parameters (see [below](#optional-reference-options)), the pipeline will create these indices for you automatically. Note that you can save the indices created for you for later by giving the `--saveReference` flag.
> If you don't specify appropriate `--bwa_index`, `--fasta_index` parameters (see [below](#optional-reference-options)), the pipeline will create these indices for you automatically. Note that you can save the indices created for you for later by giving the `--save_reference` flag.
> You must select either a `--fasta` or `--genome`
#### `--genome` (using iGenomes)
Expand Down Expand Up @@ -434,7 +434,7 @@ Supplying pre-made indices saves time in pipeline execution and is especially ad

This parameter is required to be set for large reference genomes. If your reference genome is larger than 3.5GB, the `samtools index` calls in the pipeline need to generate `CSI` indices instead of `BAI` indices to accompensate for the size of the reference genome. This parameter is not required for smaller references (including a human `hg19` or `grch37`/`grch38` reference), but `>4GB` genomes have been shown to need `CSI` indices. Default: off

#### `--saveReference`
#### `--save_reference`

Use this if you do not have pre-made reference FASTA indices for `bwa`, `samtools` and `picard`. If you turn this on, the indices EAGER2 generates for you will be stored in the `<your_output_dir>/results/reference_genomes` for you.

Expand Down Expand Up @@ -785,7 +785,7 @@ Defines whether Uracil-DNA glycosylase (UDG) treatment was used to repair DNA da

#### `--pmd_udg_type` \`half`

If you have UDGhalf treated data (Rohland et al 2016), specify `'half'` as option to this parameter to use a different model for DNA damage assessment in PMDTools. Specify the parameter with `'full'` and the DNA damage assesment will use CpG context only. If you don't specify the parameter at all, the library will be treated as non UDG treated.
If you have UDGhalf treated data (Rohland et al 2016), specify `'half'` as option to this parameter to use a different model for DNA damage assessment in PMDTools. Specify the parameter with `'full'` and the DNA damage assessment will use CpG context only. If you don't specify the parameter at all, the library will be treated as non UDG treated.

#### `--pmdtools_range`

Expand All @@ -797,7 +797,7 @@ Specifies the PMDScore threshold to use in the pipeline when filtering BAM files

#### `--pmdtools_reference_mask`

Can be used to set a reference genome mask for PMDTools.
Can be used to set a path to a reference genome mask for PMDTools.

#### `--pmdtools_max_reads`

Expand Down Expand Up @@ -1039,7 +1039,7 @@ Please note the following:
* To use `malt-build` from the same version as `malt-run`, load either the docker, singularity or conda environment.
* MALT can often require very large computing resources depending on your database. We set a absolute minimum of 16 cores and 128GB of memory (which is 1/4 of the recommendation from the developer). Please leave an issue on the [nf-core github](https://github.com/nf-core/eager/issues) if you would like to see this changed.

> RUNNING MALT ON A SERVER WITH LESS THAN 128GB OF MEMORY SHOULD BE PERFORMED AT YOUR OWN RISK
> :warning: Running MALT on a server with less than 128GB of memory should be performed at your own risk.
#### `--run_metagenomic_screening`

Expand Down
Loading

0 comments on commit ecdbdf9

Please sign in to comment.