Skip to content

Commit 05669df

Browse files
authored
Merge pull request #62 from nf-core/dev
Dev > Master for first release!
2 parents 56fa565 + f54bc48 commit 05669df

15 files changed

Lines changed: 210 additions & 178 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ jobs:
2121
sudo mv nextflow /usr/local/bin/
2222
- name: Pull docker image
2323
run: |
24-
docker pull nfcore/nanoseq:dev && docker tag nfcore/nanoseq:dev nfcore/nanoseq:dev
24+
docker pull nfcore/nanoseq:dev
25+
docker tag nfcore/nanoseq:dev nfcore/nanoseq:1.0.0
2526
- name: Basecall and demultiplex (minimap2)
2627
run: |
2728
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --aligner minimap2

.github/workflows/linting.yml

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,39 @@
11
name: nf-core linting
22
# This workflow is triggered on pushes and PRs to the repository.
33
# It runs the `nf-core lint` and markdown lint tests to ensure that the code meets the nf-core guidelines
4-
on: [push, pull_request]
4+
on:
5+
push:
6+
pull_request:
7+
release:
8+
types: [published]
59

610
jobs:
711
Markdown:
8-
runs-on: ubuntu-18.04
12+
runs-on: ubuntu-latest
913
steps:
10-
- uses: actions/checkout@v1
14+
- uses: actions/checkout@v2
1115
- uses: actions/setup-node@v1
1216
with:
1317
node-version: '10'
1418
- name: Install markdownlint
15-
run: |
16-
npm install -g markdownlint-cli
19+
run: npm install -g markdownlint-cli
1720
- name: Run Markdownlint
18-
run: |
19-
markdownlint ${GITHUB_WORKSPACE} -c ${GITHUB_WORKSPACE}/.github/markdownlint.yml
20-
nf-core:
21+
run: markdownlint ${GITHUB_WORKSPACE} -c ${GITHUB_WORKSPACE}/.github/markdownlint.yml
22+
YAML:
2123
runs-on: ubuntu-latest
2224
steps:
2325
- uses: actions/checkout@v1
26+
- uses: actions/setup-node@v1
27+
with:
28+
node-version: '10'
29+
- name: Install yaml-lint
30+
run: npm install -g yaml-lint
31+
- name: Run yaml-lint
32+
run: yamllint $(find ${GITHUB_WORKSPACE} -type f -name "*.yml")
33+
nf-core:
34+
runs-on: ubuntu-latest
35+
steps:
36+
- uses: actions/checkout@v2
2437
- name: Install Nextflow
2538
run: |
2639
wget -qO- get.nextflow.io | bash
@@ -29,13 +42,9 @@ jobs:
2942
with:
3043
python-version: '3.6'
3144
architecture: 'x64'
32-
- name: Install pip
33-
run: |
34-
sudo apt install python3-pip
35-
pip install --upgrade pip
36-
- name: Install nf-core tools
45+
- name: Install dependencies
3746
run: |
47+
python -m pip install --upgrade pip
3848
pip install nf-core
3949
- name: Run nf-core lint
40-
run: |
41-
nf-core lint ${GITHUB_WORKSPACE}
50+
run: nf-core lint ${GITHUB_WORKSPACE}

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ work/
33
data/
44
results/
55
.DS_Store
6-
test*
6+
tests/
7+
testing/
78
*.pyc

CHANGELOG.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
44
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
55

6-
## v1.0dev - [date]
6+
## [1.0.0] - 2020-03-05
77

88
Initial release of nf-core/nanoseq, created with the [nf-core](http://nf-co.re/) template.
9-
10-
### `Added`
11-
12-
### `Fixed`
13-
14-
### `Dependencies`
15-
16-
### `Deprecated`

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM nfcore/base:1.8
1+
FROM nfcore/base:1.9
22
LABEL authors="Chelsea Sawyer" \
33
description="Docker image containing all software requirements for the nf-core/nanoseq pipeline"
44

@@ -7,7 +7,7 @@ COPY environment.yml /
77
RUN conda env create -f /environment.yml && conda clean -a
88

99
# Add conda installation dir to PATH (instead of doing 'conda activate')
10-
ENV PATH /opt/conda/envs/nf-core-nanoseq-1.0dev/bin:$PATH
10+
ENV PATH /opt/conda/envs/nf-core-nanoseq-1.0.0/bin:$PATH
1111

1212
# Dump the details of the installed packages to a file for posterity
13-
RUN conda env export --name nf-core-nanoseq-1.0dev > nf-core-nanoseq-1.0dev.yml
13+
RUN conda env export --name nf-core-nanoseq-1.0.0 > nf-core-nanoseq-1.0.0.yml

README.md

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# ![nfcore/nanoseq](docs/images/nf-core-nanoseq_logo.png)
22

3-
**A pipeline to demultiplex, QC and map Nanopore data**.
4-
53
[![GitHub Actions CI Status](https://github.com/nf-core/nanoseq/workflows/nf-core%20CI/badge.svg)](https://github.com/nf-core/nanoseq/actions)
64
[![GitHub Actions Linting Status](https://github.com/nf-core/nanoseq/workflows/nf-core%20linting/badge.svg)](https://github.com/nf-core/nanoseq/actions)
75
[![Nextflow](https://img.shields.io/badge/nextflow-%E2%89%A519.10.0-brightgreen.svg)](https://www.nextflow.io/)
@@ -10,7 +8,7 @@
108

119
## Introduction
1210

13-
**nfcore/nanoseq** is a bioinformatics analysis pipeline that can be used to perform basecalling, demultiplexing, mapping and QC of Nanopore data.
11+
**nfcore/nanoseq** is a bioinformatics analysis pipeline that can be used to perform basecalling, demultiplexing, mapping and QC of Nanopore DNA/RNA sequencing data.
1412

1513
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.
1614

@@ -20,6 +18,7 @@ The pipeline is built using [Nextflow](https://www.nextflow.io), a workflow tool
2018
2. Sequencing QC ([`pycoQC`](https://github.com/a-slide/pycoQC), [`NanoPlot`](https://github.com/wdecoster/NanoPlot))
2119
3. Raw read QC ([`NanoPlot`](https://github.com/wdecoster/NanoPlot), [`FastQC`](http://www.bioinformatics.babraham.ac.uk/projects/fastqc/))
2220
4. Alignment ([`GraphMap2`](https://github.com/lbcb-sci/graphmap2) or [`minimap2`](https://github.com/lh3/minimap2))
21+
* Both aligners are capable of performing unspliced and spliced alignment. Sensible defaults will be applied automatically based on a combination of the input data and user-specified parameters
2322
* Each sample can be mapped to its own reference genome if multiplexed in this way
2423
* Convert SAM to co-ordinate sorted BAM and obtain mapping metrics ([`SAMtools`](http://www.htslib.org/doc/samtools.html))
2524
5. Create bigWig ([`BEDTools`](https://github.com/arq5x/bedtools2/), [`bedGraphToBigWig`](http://hgdownload.soe.ucsc.edu/admin/exe/)) and bigBed ([`BEDTools`](https://github.com/arq5x/bedtools2/), [`bedToBigBed`](http://hgdownload.soe.ucsc.edu/admin/exe/)) coverage tracks for visualisation
@@ -37,7 +36,7 @@ iii. Download the pipeline and test it on a minimal dataset with a single comman
3736
nextflow run nf-core/nanoseq -profile test,<docker/singularity/institute>
3837
```
3938

40-
> Please check [nf-core/configs](https://github.com/nf-core/configs#documentation) to see if a custom config file to run nf-core pipelines already exists for your Institute. If so, you can simply use `-profile institute` in your command. This will enable either `docker` or `singularity` and set the appropriate execution settings for your local compute environment.
39+
> Please check [nf-core/configs](https://github.com/nf-core/configs#documentation) to see if a custom config file to run nf-core pipelines already exists for your Institute. If so, you can simply use `-profile <institute>` in your command. This will enable either `docker` or `singularity` and set the appropriate execution settings for your local compute environment.
4140
4241
iv. Start running your own analysis!
4342

@@ -52,7 +51,7 @@ nextflow run nf-core/nanoseq \
5251
-profile <docker/singularity/institute>
5352
```
5453

55-
See [usage docs](docs/usage.md) for all of the available options when running the pipeline.
54+
See [usage docs](docs/usage.md) for all of the available options when running the pipeline. An example input samplesheet for performing both basecalling and demultiplexing can be found [here](assets/samplesheet.csv).
5655

5756
## Documentation
5857

@@ -69,7 +68,7 @@ The nf-core/nanoseq pipeline comes with documentation about the pipeline, found
6968

7069
## Credits
7170

72-
nf-core/nanoseq was originally written by [Chelsea Sawyer](https://github.com/csawye01) and [Harshil Patel](https://github.com/drpatelh) from [The Bioinformatics & Biostatistics Group](https://www.crick.ac.uk/research/science-technology-platforms/bioinformatics-and-biostatistics/) for use at [The Francis Crick Institute](https://www.crick.ac.uk/), London. [Laura Wratten](https://github.com/lwratten) from the [Genome Institute of Singapore](https://www.a-star.edu.sg/gis) is one of the primary contributors along with [Johannes Alneberg](https://github.com/alneberg) and [Franziska Bonath](https://github.com/FranBonath) from [SciLifeLab](https://www.scilifelab.se/), Sweden.
71+
nf-core/nanoseq was originally written by [Chelsea Sawyer](https://github.com/csawye01) and [Harshil Patel](https://github.com/drpatelh) from [The Bioinformatics & Biostatistics Group](https://www.crick.ac.uk/research/science-technology-platforms/bioinformatics-and-biostatistics/) for use at [The Francis Crick Institute](https://www.crick.ac.uk/), London. Other primary contributors include [Laura Wratten](https://github.com/lwratten), [Chen Ying](https://github.com/cying111) and [Jonathan Goeke](https://github.com/jonathangoeke) from the [Genome Institute of Singapore](https://www.a-star.edu.sg/gis), [Johannes Alneberg](https://github.com/alneberg) and [Franziska Bonath](https://github.com/FranBonath) from [SciLifeLab](https://www.scilifelab.se/), Sweden.
7372

7473
Many thanks to others who have helped out along the way too, including (but not limited to): [@crickbabs](https://github.com/crickbabs), [@AnnaSyme](https://github.com/AnnaSyme).
7574

@@ -82,7 +81,13 @@ For further information or help, don't hesitate to get in touch on [Slack](https
8281
## Citation
8382

8483
<!-- TODO nf-core: Add citation for pipeline after first release. Uncomment lines below and update Zenodo doi. -->
85-
<!-- If you use nf-core/nanoseq for your analysis, please cite it using the following doi: [10.5281/zenodo.XXXXXX](https://doi.org/10.5281/zenodo.XXXXXX) -->
84+
<!-- If you use nf-core/nanoseq for your analysis, please cite it using the following doi: [10.5281/zenodo.XXXXXX](https://doi.org/10.5281/zenodo.XXXXXX) -->
85+
86+
You can cite the `nf-core` publication as follows:
8687

87-
You can cite the `nf-core` pre-print as follows:
88-
> Ewels PA, Peltzer A, Fillinger S, Alneberg JA, Patel H, Wilm A, Garcia MU, Di Tommaso P, Nahnsen S. **nf-core: Community curated bioinformatics pipelines**. *bioRxiv*. 2019. p. 610741. [doi: 10.1101/610741](https://www.biorxiv.org/content/10.1101/610741v1).
88+
> **The nf-core framework for community-curated bioinformatics pipelines.**
89+
>
90+
> Philip Ewels, Alexander Peltzer, Sven Fillinger, Harshil Patel, Johannes Alneberg, Andreas Wilm, Maxime Ulysse Garcia, Paolo Di Tommaso & Sven Nahnsen.
91+
>
92+
> _Nat Biotechnol._ 2020 Feb 13. doi: [10.1038/s41587-020-0439-x](https://dx.doi.org/10.1038/s41587-020-0439-x).
93+
> ReadCube: [Full Access Link](https://rdcu.be/b1GjZ)

assets/samplesheet.csv

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
sample,fastq,barcode,genome,transcriptome
2+
Sample1,,1,mm10,
3+
Sample2,,2,hg19,
4+
Sample3,,3,/path/to/local/genome.fa,
5+
Sample4,,4,,/path/to/local/transcriptome.fa
6+
Sample5,,5,/path/to/local/genome.fa,/path/to/local/transcriptome.gtf
7+
Sample6,,6,,

0 commit comments

Comments
 (0)