Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
ad8e41a
Merge pull request #720 from nf-core/dev
jfy133 Apr 8, 2021
10bfbdf
Merge pull request #739 from nf-core/dev
jfy133 May 5, 2021
9cd8502
Template update for nf-core/tools version 1.14
nf-core-bot May 11, 2021
6d84d77
Merge branch 'TEMPLATE' of github.com:nf-core/eager into dev
jfy133 May 12, 2021
6a8325b
Remove space
jfy133 May 12, 2021
53179c7
Merge branch 'dev' into nf-core-template-merge-1.14
jfy133 May 12, 2021
bf01dee
Improve README to state useful for plants and animals as well, and al…
jfy133 May 12, 2021
98d0a80
Updated CHANGELOG
jfy133 May 12, 2021
af37f1c
Add reporting of location of multiqc run report on completeion
jfy133 May 12, 2021
08dc6ab
Add bwa -o parameter as modifying is recommend for aDNA data accordin…
jfy133 May 12, 2021
e8228a2
Improve TSV validation check
jfy133 May 12, 2021
4d05d7e
Replace empty strings with nulls following nf-core best practises
jfy133 May 12, 2021
ff618e0
Update CHANGELOG.md
jfy133 May 12, 2021
62a0c29
Update CHANGELOG.md
jfy133 May 12, 2021
58c0192
Merge pull request #742 from nf-core/nf-core-template-merge-1.14
jfy133 May 12, 2021
1135019
Merge branch 'nf-core:master' into docs-improvement
jfy133 May 12, 2021
f4e0e0e
Merge pull request #13 from nf-core/dev
jfy133 May 14, 2021
0e932d8
Merge pull request #14 from nf-core/dev
jfy133 May 14, 2021
cdeadc2
Merge pull request #745 from jfy133/multiqc-message
jfy133 May 14, 2021
22f0096
Merge pull request #15 from nf-core/dev
jfy133 May 14, 2021
3e571d5
Merge pull request #746 from jfy133/bwa-minuso-flag
jfy133 May 14, 2021
5ad1ef5
Merge pull request #16 from nf-core/dev
jfy133 May 14, 2021
0d87a0c
Update CHANGELOG.md
jfy133 May 14, 2021
6ebf660
Update CHANGELOG.md
jfy133 May 14, 2021
d98d9c7
Merge pull request #747 from jfy133/fix-null-validation
jfy133 May 14, 2021
3509b30
Ninja push for linting reasons
jfy133 May 14, 2021
07943c3
Fix bedtools annotation file condition and re-add defaults
jfy133 May 14, 2021
1c541a1
Merge branch 'dev' into docs-improvement
jfy133 May 14, 2021
9701bcb
Removed sdag profile mentions
TCLamnidis May 14, 2021
6b86a31
fix linting
jfy133 May 14, 2021
02607cc
Merge pull request #17 from TCLamnidis/docs-improvement
jfy133 May 14, 2021
03a6675
Merge pull request #744 from jfy133/docs-improvement
jfy133 May 14, 2021
d8ca43f
Update main.nf
jfy133 May 17, 2021
f613bc7
added missing label mc_small to mtnucratio
alexandregilardet May 18, 2021
63b52e5
Update CHANGELOG.md
jfy133 May 19, 2021
9866346
Merge branch 'dev' into validation-fixes-patch
jfy133 May 19, 2021
9883b85
Update CHANGELOG.md
jfy133 May 19, 2021
505a3e1
updated CHANGELOG and switched mc_small to sc_small
alexandregilardet May 19, 2021
8d409a8
Merge branch 'dev' into master
jfy133 May 19, 2021
e942094
Merge pull request #751 from alexandregilardet/master
jfy133 May 19, 2021
c0342b8
Merge branch 'dev' into validation-fixes-patch
jfy133 May 20, 2021
2828014
Merge pull request #748 from nf-core/validation-fixes-patch
jfy133 May 20, 2021
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
7 changes: 4 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@ Remember that PRs should be made against the dev branch, unless you're preparing

Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/eager/tree/master/.github/CONTRIBUTING.md)
-->
<!-- markdownlint-disable ul-indent -->

## PR checklist

- [ ] 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 you've added a new tool - add to the software_versions process and a regex to `scrape_software_versions.py`
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/eager/tree/master/.github/CONTRIBUTING.md)
- [ ] If necessary, also make a PR on the nf-core/eager _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
- [ ] If you've added a new tool - add to the software_versions process and a regex to `scrape_software_versions.py`
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](<https://github.com/>nf-core/eager/tree/master/.github/CONTRIBUTING.md)
- [ ] If necessary, also make a PR on the nf-core/eager _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
- [ ] Make sure your code lints (`nf-core lint .`).
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker`).
- [ ] Usage Documentation in `docs/usage.md` is updated.
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ on:
release:
types: [published]

# Uncomment if we need an edge release of Nextflow again
# env: NXF_EDGE: 1

jobs:
test:
name: Run workflow tests
Expand All @@ -20,7 +23,7 @@ jobs:
strategy:
matrix:
# Nextflow versions: check pipeline minimum and current latest
nxf_ver: ['20.07.1', '21.03.0-edge']
nxf_ver: ['20.07.1', '']
steps:
- name: Check out pipeline code
uses: actions/checkout@v2
Expand Down
15 changes: 12 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,21 @@
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 - [unreleased]
## v2.3.5dev - [date]

### `Added`

- [#722](https://github.com/nf-core/eager/issues/722) - Adds bwa `-o` flag for more flexibility in bwa parameters
- [#736](https://github.com/nf-core/eager/issues/736) - Add printing of multiqc run report location on successful completion

### `Fixed`

- [#723](https://github.com/nf-core/eager/issues/723) - Fixes empty fields in TSV resulting in uninformative error
- Updated template to nf-core/tools 1.14
- [#688](https://github.com/nf-core/eager/issues/688) - Clarified the pipeline is not just for humans and microbes, but also plants and animals, and also for modern DNA
- [#751](https://github.com/nf-core/eager/pull/751) - Added missing label to mtnucratio
- General code cleanup and standarisation of parameters with no default setting

### `Dependencies`

### `Deprecated`
Expand All @@ -17,12 +26,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

### `Added`

- [#729](https://github.com/nf-core/eager/issues/729) Added Bowtie2 flag `--maxins` for PE mapping modern DNA mapping contexts
- [#729](https://github.com/nf-core/eager/issues/729) - Added Bowtie2 flag `--maxins` for PE mapping modern DNA mapping contexts

### `Fixed`

- Corrected explanation of the "--min_adap_overlap" parameter for AdapterRemoval in the docs
- [#725](https://github.com/nf-core/eager/pull/725) `bwa_index` doc update
- [#725](https://github.com/nf-core/eager/pull/725) - `bwa_index` doc update
- Re-adds gzip piping to AdapterRemovalFixPrefix to speed up process after reports of being very slow
- Updated DamageProfiler citation from bioRxiv to publication

Expand Down
6 changes: 1 addition & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM nfcore/base:1.13.3
FROM nfcore/base:1.14
LABEL authors="The nf-core/eager community" \
description="Docker image containing all software requirements for the nf-core/eager pipeline"

Expand All @@ -11,7 +11,3 @@ ENV PATH /opt/conda/envs/nf-core-eager-2.3.5dev/bin:$PATH

# Dump the details of the installed packages to a file for posterity
RUN conda env export --name nf-core-eager-2.3.5dev > nf-core-eager-2.3.5dev.yml

# Instruct R processes to use these empty files instead of clashing with a local version
RUN touch .Rprofile
RUN touch .Renviron
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
## Introduction

<!-- nf-core: Write a 1-2 sentence summary of what data the pipeline is for and what it does -->
**nf-core/eager** is a bioinformatics best-practise analysis pipeline for NGS sequencing based ancient DNA (aDNA) data analysis.
**nf-core/eager** is a scalable and reproducible bioinformatics best-practise processing pipeline for genomic NGS sequencing data, with a focus on ancient DNA (aDNA) data. It is ideal for the (palaeo)genomic analysis of humans, animals, plants, microbes and even microbiomes.

The pipeline is built using [Nextflow](https://www.nextflow.io), a workflow tool to run tasks across multiple compute infrastructures in a very portable manner. It comes with docker containers making installation trivial and results highly reproducible. The pipeline pre-processes raw data from FASTQ inputs, or preprocessed BAM inputs. It can align reads and performs extensive general NGS and aDNA specific quality-control on the results. It comes with docker, singularity or conda containers making installation trivial and results highly reproducible.

Expand All @@ -27,7 +27,7 @@ The pipeline is built using [Nextflow](https://www.nextflow.io), a workflow tool

## Quick Start

1. Install [`nextflow`](https://nf-co.re/usage/installation) (version >= 20.04.0)
1. Install [`nextflow`](https://nf-co.re/usage/installation) (`>=20.07.1`)

2. Install any of [`Docker`](https://docs.docker.com/engine/installation/), [`Singularity`](https://www.sylabs.io/guides/3.0/user-guide/), [`Podman`](https://podman.io/), [`Shifter`](https://nersc.gitlab.io/development/shifter/how-to-use/) or [`Charliecloud`](https://hpc.github.io/charliecloud/) for full pipeline reproducibility _(please only use [`Conda`](https://conda.io/miniconda.html) as a last resort; see [docs](https://nf-co.re/usage/configuration#basic-configuration-profiles))_

Expand Down
Loading