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

Merging template updates 2.1 #56

Merged
merged 74 commits into from
Aug 25, 2021
Merged
Changes from 1 commit
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
8e43acd
Template update for nf-core/tools version 1.12
nf-core-bot Nov 19, 2020
2e7540d
Template update for nf-core/tools version 1.12.1
nf-core-bot Dec 3, 2020
225a827
Template update for nf-core/tools version 1.13
nf-core-bot Mar 18, 2021
be7bbe1
Template update for nf-core/tools version 1.13.1
nf-core-bot Mar 19, 2021
ceebac0
Template update for nf-core/tools version 1.13.2
nf-core-bot Mar 23, 2021
0f9ba31
Template update for nf-core/tools version 1.13.3
nf-core-bot Mar 25, 2021
b4b1d3a
Template update for nf-core/tools version 1.14
nf-core-bot May 11, 2021
fc85b5d
Template update for nf-core/tools version 2.0
KevinMenden Jul 13, 2021
db29c73
Template update for nf-core/tools version 2.0.1
nf-core-bot Jul 13, 2021
e19ae65
Template update for nf-core/tools version 2.1
nf-core-bot Jul 27, 2021
798cea3
barebone template update 2.1
d4straub Aug 2, 2021
e578b4f
fix CHANGELOG.md
d4straub Aug 2, 2021
239a48f
fix linting
d4straub Aug 2, 2021
45cc713
update description and README
d4straub Aug 2, 2021
b6d1a8f
update schema and version
d4straub Aug 3, 2021
5afb220
change samplesheet to csv and fix parsing
d4straub Aug 3, 2021
2cc2e70
fix linting
d4straub Aug 3, 2021
335e175
add skewer
d4straub Aug 3, 2021
b513931
fix linting
d4straub Aug 3, 2021
c64afa0
add more modules
d4straub Aug 4, 2021
0941b47
from samplesheet csv to unicycler channels all fine
d4straub Aug 5, 2021
4034bcf
add skewer version
d4straub Aug 6, 2021
b7cee69
add prokka, kraken2 and quast
d4straub Aug 6, 2021
6c89976
fix linting
d4straub Aug 6, 2021
90392bd
samplesheet from tsv to csv again
d4straub Aug 6, 2021
8f72103
use nf-core prokka module
d4straub Aug 6, 2021
f72bc41
add dfast
d4straub Aug 6, 2021
090f175
modify test profiles
d4straub Aug 9, 2021
bfa5b42
create assembly channel
d4straub Aug 9, 2021
008f01e
fix test_long_miniasm
d4straub Aug 9, 2021
0d26ae8
add canu but test fails because reads do not overlap
d4straub Aug 9, 2021
e92471f
add miniasm assembly
d4straub Aug 9, 2021
b6fc4d7
canu test_long: bacass_long_miniasm.csv instead bacass_long.csv
d4straub Aug 9, 2021
94a0f7d
add consensus (racon) for miniasm
d4straub Aug 9, 2021
6644546
fix racon version output
d4straub Aug 9, 2021
931c9c4
fix test_long
d4straub Aug 13, 2021
a6e62a6
add medaka
d4straub Aug 13, 2021
d00f08b
add nanopolish
d4straub Aug 16, 2021
a0df16f
adjust resources
d4straub Aug 16, 2021
00bc5fd
fix test_long_miniasm
d4straub Aug 16, 2021
7d3fc0a
activate medaka for test_long_miniasm
d4straub Aug 16, 2021
5b91536
fix miniasm assembly
d4straub Aug 17, 2021
08fcfe8
fix kraken2 and activate for test_long_miniasm
d4straub Aug 17, 2021
206c6e6
adjust output folders
d4straub Aug 17, 2021
82ba5a9
update CHANGELOG
d4straub Aug 18, 2021
71e42db
fix kraken2 input
d4straub Aug 18, 2021
df6a5bd
fix kraken2 output
d4straub Aug 18, 2021
aefcd1e
fix kraken2 output 2
d4straub Aug 18, 2021
e3a071f
fix linting
d4straub Aug 18, 2021
54ead7f
refine output folders
d4straub Aug 18, 2021
05b54d0
add change in --krakendb
d4straub Aug 19, 2021
1f8718c
add zenodo doi
d4straub Aug 19, 2021
a58fd8e
change dfast output to folder DFAST
d4straub Aug 19, 2021
05ac341
update CITATTIONS
d4straub Aug 19, 2021
5091db8
update README
d4straub Aug 19, 2021
d6b9840
update output docs
d4straub Aug 19, 2021
34fc917
remove TODO
d4straub Aug 19, 2021
ad96a76
fix dfast
d4straub Aug 19, 2021
9c0b316
fix picoqc
d4straub Aug 19, 2021
911186a
fix linting and pycoqc
d4straub Aug 19, 2021
097938e
update output with medaka and nanopolish
d4straub Aug 19, 2021
5ecd08e
remove samtools files from results folder
d4straub Aug 19, 2021
e7b9ec2
update parameter descriptions
d4straub Aug 19, 2021
545763a
remove parallel from nanopolish
d4straub Aug 20, 2021
6c6f01a
fix pycoqc
d4straub Aug 20, 2021
787ae45
amend output and update usage
d4straub Aug 20, 2021
1df85e5
remove tabs
d4straub Aug 20, 2021
8ba97d6
fix nanopolish input
d4straub Aug 20, 2021
ae2a20f
fix nanopolish input
d4straub Aug 20, 2021
1455d9d
remove unused samplesheet check and solve some TODOs
d4straub Aug 20, 2021
61df69d
remove any connection to igenomes
d4straub Aug 23, 2021
a1baa68
add full size test dataset
d4straub Aug 23, 2021
97a1ea8
removed unused parameter from test_long
d4straub Aug 23, 2021
002fcd0
ignore igenomes_base to avoid frequent warning with institutional pro…
d4straub Aug 23, 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
Prev Previous commit
Next Next commit
Template update for nf-core/tools version 1.13.2
nf-core-bot committed Mar 23, 2021
commit ceebac0341841490314443746659bce56a6cca26
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ jobs:
strategy:
matrix:
# Nextflow versions: check pipeline minimum and current latest
nxf_ver: ['20.04.0', '']
nxf_ver: ['20.04.0', '21.03.0-edge']
steps:
- name: Check out pipeline code
uses: actions/checkout@v2
57 changes: 56 additions & 1 deletion .github/workflows/linting.yml
Original file line number Diff line number Diff line change
@@ -19,6 +19,34 @@ jobs:
run: npm install -g markdownlint-cli
- name: Run Markdownlint
run: markdownlint ${GITHUB_WORKSPACE} -c ${GITHUB_WORKSPACE}/.github/markdownlint.yml

# If the above check failed, post a comment on the PR explaining the failure
- name: Post PR comment
if: failure()
uses: mshick/add-pr-comment@v1
with:
message: |
## Markdown linting is failing

To keep the code consistent with lots of contributors, we run automated code consistency checks.
To fix this CI test, please run:

* Install `markdownlint-cli`
* On Mac: `brew install markdownlint-cli`
* Everything else: [Install `npm`](https://www.npmjs.com/get-npm) then [install `markdownlint-cli`](https://www.npmjs.com/package/markdownlint-cli) (`npm install -g markdownlint-cli`)
* Fix the markdown errors
* Automatically: `markdownlint . --config .github/markdownlint.yml --fix`
* Manually resolve anything left from `markdownlint . --config .github/markdownlint.yml`

Once you push these changes the test should pass, and you can hide this comment :+1:

We highly recommend setting up markdownlint in your code editor so that this formatting is done automatically on save. Ask about it on Slack for help!

Thanks again for your contribution!
repo-token: ${{ secrets.GITHUB_TOKEN }}
allow-repeats: false


YAML:
runs-on: ubuntu-latest
steps:
@@ -29,7 +57,34 @@ jobs:
- name: Install yaml-lint
run: npm install -g yaml-lint
- name: Run yaml-lint
run: yamllint $(find ${GITHUB_WORKSPACE} -type f -name "*.yml")
run: yamllint $(find ${GITHUB_WORKSPACE} -type f -name "*.yml" -o -name "*.yaml")

# If the above check failed, post a comment on the PR explaining the failure
- name: Post PR comment
if: failure()
uses: mshick/add-pr-comment@v1
with:
message: |
## YAML linting is failing

To keep the code consistent with lots of contributors, we run automated code consistency checks.
To fix this CI test, please run:

* Install `yaml-lint`
* [Install `npm`](https://www.npmjs.com/get-npm) then [install `yaml-lint`](https://www.npmjs.com/package/yaml-lint) (`npm install -g yaml-lint`)
* Fix the markdown errors
* Run the test locally: `yamllint $(find . -type f -name "*.yml" -o -name "*.yaml")`
* Fix any reported errors in your YAML files

Once you push these changes the test should pass, and you can hide this comment :+1:

We highly recommend setting up yaml-lint in your code editor so that this formatting is done automatically on save. Ask about it on Slack for help!

Thanks again for your contribution!
repo-token: ${{ secrets.GITHUB_TOKEN }}
allow-repeats: false


nf-core:
runs-on: ubuntu-latest
steps:
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM nfcore/base:1.13.1
FROM nfcore/base:1.13.2
LABEL authors="Andreas Wilm, Alexander Peltzer" \
description="Docker image containing all software requirements for the nf-core/bacass pipeline"

Empty file modified bin/markdown_to_html.py
100644 → 100755
Empty file.
Empty file modified bin/scrape_software_versions.py
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion lib/NfcoreSchema.groovy
Original file line number Diff line number Diff line change
@@ -219,7 +219,7 @@ class NfcoreSchema {
}
}
}
if(rawSchema.keySet().contains('properties') && rawSchema.get('properties').containsKey(ignore_param)) {
if(rawSchema.keySet().contains('properties') && rawSchema.get('properties').keySet().contains(ignore_param)) {
rawSchema.get("properties").remove(ignore_param)
}
if(rawSchema.keySet().contains('required') && rawSchema.required.contains(ignore_param)) {