Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

First Release #19

Merged
merged 98 commits into from
Oct 8, 2019
Merged
Show file tree
Hide file tree
Changes from 89 commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
baa6393
WIP towards nf-core
maxulysse Apr 30, 2019
9780f01
update README (#1)
maxulysse May 1, 2019
c1d0337
More fixes (#2)
maxulysse May 1, 2019
c46c460
Include preprocessing (#3)
maxulysse May 2, 2019
c117cba
Add some Variant Calling (#4)
maxulysse May 3, 2019
cf29773
fix Jenkins tests
maxulysse May 3, 2019
578e239
sort ansi codes
maxulysse May 3, 2019
ed447ba
add tests
maxulysse May 3, 2019
d93b562
add Manta, Strelka, StrelkaBP, MuTecT2, Freebayes, Ascat, Controlfreec
maxulysse May 3, 2019
45928fc
update docs
maxulysse May 3, 2019
a1a9014
fix travis tests
maxulysse May 3, 2019
0e78ffb
Merge pull request #5 from MaxUlysse/nf-core-VC
apeltzer May 3, 2019
8c5a875
Add default containers for annotation (#6)
maxulysse May 3, 2019
3c5f236
Nf core vc (#7)
maxulysse May 8, 2019
f9e13a4
Improve tests and docs (#8)
maxulysse May 14, 2019
77b98d3
more docs (#9)
maxulysse May 21, 2019
61799e2
Docs (#11)
maxulysse Jun 3, 2019
a9cb70e
Configs and docs (#12)
maxulysse Jun 12, 2019
818d760
Fix merged annotation (#13)
maxulysse Jun 14, 2019
2a2c499
fix output name for vcf
maxulysse Jun 17, 2019
89cac8b
Merge pull request #14 from MaxUlysse/nf-core-dev
apeltzer Jun 21, 2019
10eff4e
Fix R scripts (#16)
maxulysse Jun 24, 2019
0d66968
More improvments (#18)
maxulysse Jul 5, 2019
c9088ff
More fixes (#20)
maxulysse Jul 23, 2019
d0f03fe
Add Tiddit (#10)
maxulysse Aug 7, 2019
ca2a0b0
More improvments (#21)
maxulysse Aug 12, 2019
04cb96e
Update docs (#29)
maxulysse Aug 28, 2019
c0d69e1
Memory parameter singleCPUMem is now possible to use (#22)
alneberg Sep 2, 2019
2647ec1
Add GitHubActions (#27)
maxulysse Sep 3, 2019
1547a31
small refactoring (#30)
maxulysse Sep 3, 2019
f4a9dbf
print more info for branch protection github actions
maxulysse Sep 3, 2019
70fb026
adding nf-core lint (#31)
maxulysse Sep 4, 2019
8c175a8
fix ci
maxulysse Sep 5, 2019
747f8cd
Install Ascat with bioconda (#32)
maxulysse Sep 5, 2019
641dda2
fix GitHub Actions CI
maxulysse Sep 6, 2019
2afd383
Panel of Normals (#24)
maxulysse Sep 6, 2019
29e12f0
fix MD lint
maxulysse Sep 6, 2019
22670b6
got ascat version using R library(ASCAT) + use workflow.manifest.vers…
maxulysse Sep 6, 2019
cf682f4
update CHANGELOG
maxulysse Sep 6, 2019
6dd387f
code polishing
maxulysse Sep 6, 2019
ab0e872
code polishing
maxulysse Sep 9, 2019
5f8d2a7
fix memory usage
maxulysse Sep 9, 2019
dd08e66
Merge pull request #33 from MaxUlysse/BackToLint
apeltzer Sep 9, 2019
1c48f2a
update reference files
maxulysse Sep 9, 2019
c8bc0e8
fix params name
maxulysse Sep 9, 2019
f6e0003
fix branch protection GitHub actions
maxulysse Sep 10, 2019
e01cbfb
fix branch protection GitHub actions
maxulysse Sep 10, 2019
c0c08ae
fixing badges
maxulysse Sep 10, 2019
4a65852
Merge remote-tracking branch 'upstream/dev' into AWS-iGenomes
maxulysse Sep 10, 2019
5ea919f
Change --sample by --input (#23)
maxulysse Sep 10, 2019
ab08668
Merge remote-tracking branch 'upstream/dev' into AWS-iGenomes
maxulysse Sep 10, 2019
107a0f3
Update tools
maxulysse Sep 12, 2019
4f6cc22
fix path to files
maxulysse Sep 12, 2019
c0a86e2
Merge pull request #34 from MaxUlysse/AWS-iGenomes
apeltzer Sep 13, 2019
2c71f7c
update CHANGELOG
maxulysse Sep 13, 2019
497c00e
update files
maxulysse Sep 13, 2019
a1a56f6
rename script
maxulysse Sep 13, 2019
542d4d1
Merge remote-tracking branch 'upstream/dev' into Updates
maxulysse Sep 13, 2019
f8d78f3
code polishing
maxulysse Sep 13, 2019
55ffad3
revert updates
maxulysse Sep 13, 2019
9930681
revert updates
maxulysse Sep 13, 2019
ae2f03e
update docs
maxulysse Sep 13, 2019
2eb4f6e
add comments to params
maxulysse Sep 13, 2019
574790a
remove Mutect2 from MULTIPLE
maxulysse Sep 15, 2019
9d780da
more code polishing
maxulysse Sep 15, 2019
6c69699
update CHANGELOG
maxulysse Sep 15, 2019
87adf67
more code polishing
maxulysse Sep 17, 2019
2fb0422
code polish
maxulysse Sep 17, 2019
1db0b94
revert changes
maxulysse Sep 17, 2019
97f2cb8
update CHANGELOG
maxulysse Sep 17, 2019
938aac2
Update conf/test.config
maxulysse Sep 17, 2019
d98640c
Merge pull request #35 from MaxUlysse/Updates
apeltzer Sep 17, 2019
04fa5b4
move params definition from main.nf to conf/base.config
maxulysse Sep 18, 2019
2dd6802
default params.outdir is results
maxulysse Sep 18, 2019
968e80d
update docs
maxulysse Sep 18, 2019
89dae9c
move all params from conf/base.config to nextflow.config
maxulysse Sep 18, 2019
511e1e8
enhanced config
maxulysse Sep 18, 2019
1cbdc30
better logs
maxulysse Sep 18, 2019
8610d7e
code polishing
maxulysse Sep 18, 2019
e04fdc3
add comments
maxulysse Sep 18, 2019
497e8e2
remove comments
maxulysse Sep 18, 2019
0b13966
no need to use check_resource for cpus_max or memory_max
maxulysse Sep 18, 2019
1259242
Merge pull request #36 from MaxUlysse/CleanUp
apeltzer Sep 18, 2019
9b572d0
Merge branch 'master' into dev
maxulysse Sep 18, 2019
945bd3a
fix markdownlint
maxulysse Sep 18, 2019
e64c3a4
default PublishDirMode is now copy
maxulysse Sep 19, 2019
24e4601
Prepare release (#37)
maxulysse Sep 20, 2019
af8650e
Update README.md
maxulysse Sep 24, 2019
c60d99e
Update README.md
maxulysse Sep 24, 2019
584b3b2
Apply suggestions from code review
maxulysse Sep 24, 2019
3b98c88
Apply suggestions from code review
maxulysse Sep 25, 2019
dc6cf30
Avoid collision in MultiQC (#38)
maxulysse Sep 27, 2019
64d9c10
Fix ch_dbsnp channel (#39)
maxulysse Sep 27, 2019
3acba37
Update nextflow.config
maxulysse Oct 8, 2019
d11be86
use tagged image
maxulysse Oct 8, 2019
ff8807b
add patch to branch protection
maxulysse Oct 8, 2019
4bd1ae0
remove VEP from CI as it's currently failing
maxulysse Oct 8, 2019
8d80be3
set time for MapReads process to 48.h
maxulysse Oct 8, 2019
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
85 changes: 85 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
version: 2.0
jobs:
snpeffgrch37: &buildsnpeff
docker:
- image: circleci/buildpack-deps:stretch
environment:
GENOME: GRCh37
SNPEFF_CACHE_VERSION: "75"
steps:
- checkout
- setup_remote_docker
- run:
command: docker build -t nfcore/sareksnpeff:2.5.${GENOME} containers/snpeff/. --build-arg GENOME=${GENOME} --build-arg SNPEFF_CACHE_VERSION=${SNPEFF_CACHE_VERSION}
- run:
command: |
echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
docker push nfcore/sareksnpeff:2.5.${GENOME}

snpeffgrch38:
<< : *buildsnpeff
environment:
GENOME: GRCh38
SNPEFF_CACHE_VERSION: "86"

snpeffgrcm38:
<< : *buildsnpeff
environment:
GENOME: GRCm38
SNPEFF_CACHE_VERSION: "86"

snpeffcanfam3_1:
<< : *buildsnpeff
environment:
GENOME: CanFam3.1
SNPEFF_CACHE_VERSION: "86"

vepgrch37: &buildvep
docker:
- image: circleci/buildpack-deps:stretch
environment:
GENOME: GRCh37
SPECIES: homo_sapiens
VEP_VERSION: "95"
steps:
- checkout
- setup_remote_docker
- run:
command: docker build -t nfcore/sarekvep:2.5.${GENOME} containers/vep/. --build-arg GENOME=${GENOME} --build-arg SPECIES=${SPECIES} --build-arg VEP_VERSION=${VEP_VERSION}
no_output_timeout: 3h
- run:
command: echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin ; docker push nfcore/sarekvep:2.5.${GENOME}

vepgrch38:
<< : *buildvep
environment:
GENOME: GRCh38
SPECIES: homo_sapiens
VEP_VERSION: "95"

vepgrcm38:
<< : *buildvep
environment:
GENOME: GRCm38
SPECIES: mus_musculus
VEP_VERSION: "95"

vepcanfam3_1:
<< : *buildvep
environment:
GENOME: CanFam3.1
SPECIES: canis_familiaris
VEP_VERSION: "95"

workflows:
version: 2
build:
jobs:
- snpeffcanfam3_1
- snpeffgrch37
- snpeffgrch38
- snpeffgrcm38
- vepcanfam3_1
- vepgrch37
- vepgrch38
- vepgrcm38
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ If there are any failures then the automated tests fail.
These tests are run both with the latest available version of Nextflow and also the minimum required version that is stated in the pipeline code.

## Getting help
For further information/help, please consult the [nf-core/sarek documentation](https://github.com/nf-core/sarek#documentation) and don't hesitate to get in touch on the pipeline channel on [Slack](https://nf-core-invite.herokuapp.com/).
For further information/help, please consult the [nf-core/sarek documentation](https://github.com/nf-core/sarek#documentation) and don't hesitate to get in touch on the [sarek pipeline channel](https://nfcore.slack.com/channels/sarek) on [Slack](https://nf-co.re/join/slack).
7 changes: 4 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
Many thanks to contributing to nf-core/sarek!

Please fill in the appropriate checklist below (delete whatever is not relevant). These are the most common things requested on pull requests (PRs).
Please fill in the appropriate checklist below (delete whatever is not relevant).
These are the most common things requested on pull requests (PRs).

## 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 necessary, also make a PR on the [nf-core/sarek branch on the nf-core/test-datasets repo]( https://github.com/nf-core/test-datasets/pull/new/nf-core/sarek)
- [ ] If necessary, also make a PR on the [nf-core/sarek branch on the nf-core/test-datasets repo](https://github.com/nf-core/test-datasets/pull/new/nf-core/sarek)
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker`).
- [ ] Make sure your code lints (`nf-core lint .`).
- [ ] Documentation in `docs` is updated
- [ ] `CHANGELOG.md` is updated
- [ ] `README.md` is updated

**Learn more about contributing:** https://github.com/nf-core/sarek/tree/master/.github/CONTRIBUTING.md
**Learn more about contributing:** [guidelines](https://github.com/nf-core/sarek/tree/master/.github/CONTRIBUTING.md)
3 changes: 3 additions & 0 deletions .github/markdownlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@ blanks-around-lists: false
header-increment: false
no-duplicate-header:
siblings_only: true
no-inline-html:
allowed_elements:
- img
16 changes: 16 additions & 0 deletions .github/workflows/branch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: sarek branch protection
# This workflow is triggered on PRs to master branch on the repository
on:
pull_request:
branches:
- master

jobs:
test:
runs-on: ubuntu-latest
steps:
# PRs are only ok if coming from an nf-core dev branch
- uses: actions/checkout@v1
- name: Check PRs
run: |
[[ $(git remote get-url origin) == *nf-core/sarek ]] && [ ${GITHUB_BASE_REF} = "master" ] && [ ${GITHUB_HEAD_REF} = "dev" ]
24 changes: 24 additions & 0 deletions .github/workflows/ci-extra.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: sarek extra CI
# This workflow is triggered on pushes and PRs to the repository.
on: [push, pull_request]

jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
test: [ANNOTATESNPEFF, ANNOTATEVEP, GERMLINE, SOMATIC, TARGETED]
nxf_ver: ['19.04.0', '']
steps:
- uses: actions/checkout@v1
- name: Install Nextflow
run: |
export NXF_VER=${{ matrix.nxf_ver }}
wget -qO- get.nextflow.io | bash
sudo mv nextflow /usr/local/bin/
- name: Download image
run: |
${GITHUB_WORKSPACE}/scripts/download_image.sh -n docker --source-version dev --target-version 2.5 --test ${{ matrix.test }}
- name: Run test
run: |
${GITHUB_WORKSPACE}/scripts/run_tests.sh --test ${{ matrix.test }} --verbose
24 changes: 24 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: sarek CI
# This workflow is triggered on pushes and PRs to the repository.
on: [push, pull_request]

jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
nxf_ver: ['19.04.0', '']
steps:
- uses: actions/checkout@v1
- name: Install Nextflow
run: |
export NXF_VER=${{ matrix.nxf_ver }}
wget -qO- get.nextflow.io | bash
sudo mv nextflow /usr/local/bin/
- name: Download and tag image
run: |
docker pull nfcore/sarek:dev
docker tag nfcore/sarek:dev nfcore/sarek:2.5
- name: Run test
run: |
nextflow run ${GITHUB_WORKSPACE} -profile test,docker
53 changes: 53 additions & 0 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: sarek linting
# This workflow is triggered on pushes and PRs to the repository.
on: [push, pull_request]

jobs:
Markdown:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: '10'
- name: Install markdownlint
run: |
npm install -g markdownlint-cli
- name: Run Markdownlint
run: |
markdownlint ${GITHUB_WORKSPACE} -c ${GITHUB_WORKSPACE}/.github/markdownlint.yml
YAML:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: '10'
- name: Install yamllint
run: |
npm install -g yaml-lint
- name: Run yamllint
run: |
yamllint $(find ${GITHUB_WORKSPACE} -type f -name "*.yml")
nf-core:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Install Nextflow
run: |
wget -qO- get.nextflow.io | bash
sudo mv nextflow /usr/local/bin/
- uses: actions/setup-python@v1
with:
python-version: '3.6'
architecture: 'x64'
- name: Install pip
run: |
sudo apt install python3-pip
pip install --upgrade pip
- name: Install nf-core tools
run: |
pip install nf-core
- name: Run nf-core lint
run: |
nf-core lint ${GITHUB_WORKSPACE}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.nextflow*
work/
data/
references/
results/
.DS_Store
tests/test_data
Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ before_install:
- docker pull nfcore/sarek:dev
# Fake the tag locally so that the pipeline runs properly
# Looks weird when this is :dev to :dev, but makes sense when testing code for a release (:dev to :1.0.1)
- docker tag nfcore/sarek:dev nfcore/sarek:dev
- docker tag nfcore/sarek:dev nfcore/sarek:2.5

install:
# Install Nextflow
Expand All @@ -30,7 +30,7 @@ install:
- sudo apt-get install npm && npm install -g markdownlint-cli

env:
- NXF_VER='0.32.0' # Specify a minimum NF version that should be tested and work
- NXF_VER='19.04.0' # Specify a minimum NF version that should be tested and work
- NXF_VER='' # Plus: get the latest NF version and check that it works

script:
Expand All @@ -39,4 +39,4 @@ script:
# Lint the documentation
- markdownlint ${TRAVIS_BUILD_DIR} -c ${TRAVIS_BUILD_DIR}/.github/markdownlint.yml
# Run the pipeline with the test profile
- nextflow run ${TRAVIS_BUILD_DIR} -profile test,docker
- nextflow run ${TRAVIS_BUILD_DIR} -profile test,docker
Loading