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

Dev #27

Merged
merged 52 commits into from
Jan 17, 2024
Merged

Dev #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
0b1e295
Template update for nf-core/tools version 2.10
nf-core-bot Sep 26, 2023
b96fc77
Changed primer set to params
svarona Aug 18, 2023
79a67f0
Added artic to nextflow config
svarona Aug 23, 2023
06e82cf
Moved artic primer params value from nextflow config to nanopore test…
svarona Aug 23, 2023
addd692
Added PR to CHANGELOG
svarona Oct 23, 2023
ce82ef6
Merge branch 'TEMPLATE' into dev_template
svarona Oct 31, 2023
977d069
Fixed notes
svarona Nov 2, 2023
a90a257
Fixed a header
svarona Nov 2, 2023
4976471
Fixed biocontainers
svarona Nov 2, 2023
66be601
Added missing change
svarona Nov 2, 2023
67f531e
Fixed quay.io
svarona Nov 2, 2023
0fd940b
removed quay.io from main.nf
svarona Nov 2, 2023
b6804f5
Fixed again quay.io
svarona Nov 2, 2023
9da284a
Fixed test2
svarona Nov 2, 2023
c3a677d
Fixed module
svarona Nov 2, 2023
ff372f7
mas test
svarona Nov 2, 2023
a507d99
removed duplicated line
svarona Dec 19, 2023
9e0a1c2
Template update for nf-core/tools version 2.11
nf-core-bot Dec 19, 2023
20dc34d
updated modules
saramonzon Dec 19, 2023
7f2923b
fixing modules call according to updates
saramonzon Dec 19, 2023
3bd897e
Fixed lint
svarona Dec 20, 2023
48f8032
Template update for nf-core/tools version 2.11.1
nf-core-bot Dec 20, 2023
55bfa3a
Merge branch 'TEMPLATE' into dev_template
svarona Dec 21, 2023
3c7778c
Merge branch 'TEMPLATE' into dev_template
svarona Dec 21, 2023
fa532f6
Fix prettier
svarona Dec 21, 2023
dcc56b2
pixed prettier
svarona Dec 21, 2023
bf5fd9d
Fixed some conflicts
svarona Dec 22, 2023
28ce0d2
Updated modules
svarona Dec 27, 2023
a8ce52a
Fixed quast process
svarona Dec 27, 2023
8d57896
Fixed quast for multiqc
svarona Dec 27, 2023
5d63daf
Fixed ref fasta channel
svarona Dec 27, 2023
96cdeb7
Fixed ref fasta channel
svarona Dec 27, 2023
cfea905
Fixed empty channels
svarona Dec 27, 2023
eb7a82d
Fixed mosdepth process
svarona Dec 27, 2023
6d5b405
Fixed empty fields
svarona Dec 27, 2023
ad5b38a
Fixed quast
svarona Dec 27, 2023
5ccac08
Fixed mosdepth
svarona Dec 27, 2023
78a4143
Fixed empty channels
svarona Dec 27, 2023
661ec68
Fixed fasta channel
svarona Dec 27, 2023
508e270
Fixed gff channel for empty path
svarona Dec 27, 2023
566837a
Fixed prettier
svarona Dec 28, 2023
bb66560
Fixed empty channels
svarona Dec 28, 2023
b3d2dbb
Download medaka model for nanopore test
svarona Jan 15, 2024
249146a
Removed TODO comment
svarona Jan 16, 2024
4c850ba
Removed igenomes_base
svarona Jan 16, 2024
8df9b78
removed igenomes_base from validationSchemaIgnoreParams
svarona Jan 16, 2024
be0473b
Merge pull request #408 from BU-ISCIII/dev_template
svarona Jan 16, 2024
fe0a9ff
Merge branch 'dev' into artic_primers
svarona Jan 16, 2024
7b19b0a
added primer set artic to usage example
svarona Jan 16, 2024
d6ff06c
added primerset artic to usage examples
svarona Jan 16, 2024
ce72f48
Merge pull request #393 from BU-ISCIII/artic_primers
svarona Jan 16, 2024
b57d083
Merge branch 'custom_gtf' into dev
svarona Jan 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"name": "nfcore",
"image": "nfcore/gitpod:latest",
"remoteUser": "gitpod",
"runArgs": ["--privileged"],

// Configure tool-specific properties.
"customizations": {
Expand Down
7 changes: 6 additions & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ Please use the pre-filled template to save time.
However, don't be put off by this template - other more general issues and suggestions are welcome!
Contributions to the code are even more welcome ;)

> If you need help using or modifying nf-core/viralrecon then the best place to ask is on the nf-core Slack [#viralrecon](https://nfcore.slack.com/channels/viralrecon) channel ([join our Slack here](https://nf-co.re/join/slack)).
:::info
If you need help using or modifying nf-core/viralrecon then the best place to ask is on the nf-core Slack [#viralrecon](https://nfcore.slack.com/channels/viralrecon) channel ([join our Slack here](https://nf-co.re/join/slack)).
:::

## Contribution workflow

Expand All @@ -25,6 +27,9 @@ If you're not used to this workflow with git, you can start with some [docs from

## Tests

You can optionally test your changes by running the pipeline locally. Then it is recommended to use the `debug` profile to
receive warnings about process selectors and other debug info. Example: `nextflow run . -profile debug,test,docker --outdir <OUTDIR>`.

When you create a pull request with changes, [GitHub Actions](https://github.com/features/actions) will run automatic tests.
Typically, pull-requests are only fully reviewed when these tests are passing, though of course we can help out before then.

Expand Down
1 change: 1 addition & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/vira
- [ ] If necessary, also make a PR on the nf-core/viralrecon _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 --outdir <OUTDIR>`).
- [ ] Check for unexpected warnings in debug mode (`nextflow run . -profile debug,test,docker --outdir <OUTDIR>`).
- [ ] Usage Documentation in `docs/usage.md` is updated.
- [ ] Output Documentation in `docs/output.md` is updated.
- [ ] `CHANGELOG.md` is updated.
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- "latest-everything"
steps:
- name: Check out pipeline code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Nextflow
uses: nf-core/setup-nextflow@v1
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
- "--min_barcode_reads 10000"
- "--min_guppyplex_reads 10000"
- "--artic_minion_caller medaka --sequencing_summary false --fast5_dir false"
- "--artic_minion_caller medaka --sequencing_summary false --fast5_dir false --artic_minion_medaka_model r941_min_high_g360"
- "--artic_minion_caller medaka --sequencing_summary false --fast5_dir false --artic_minion_medaka_model ./r941_min_high_g360_model.hdf5"
steps:
- name: Check out pipeline code
uses: actions/checkout@v2
Expand All @@ -112,6 +112,9 @@ jobs:
run: |
wget -qO- get.nextflow.io | bash
sudo mv nextflow /usr/local/bin/
- name: Download medaka model
run: |
wget https://github.com/nanoporetech/medaka/raw/master/medaka/data/r941_min_high_g360_model.hdf5

- name: Run pipeline with minimal Nanopore data and various options
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/fix-linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
# Use the @nf-core-bot token to check out so we can push later
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
token: ${{ secrets.nf_core_bot_auth_token }}

Expand All @@ -24,7 +24,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.nf_core_bot_auth_token }}

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4

- name: Install Prettier
run: npm install -g prettier @prettier/plugin-php
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
EditorConfig:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4

- name: Install editorconfig-checker
run: npm install -g editorconfig-checker
Expand All @@ -27,9 +27,9 @@ jobs:
Prettier:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4

- name: Install Prettier
run: npm install -g prettier
Expand All @@ -40,7 +40,7 @@ jobs:
PythonBlack:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Check code lints with Black
uses: psf/black@stable
Expand Down Expand Up @@ -71,14 +71,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out pipeline code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Nextflow
uses: nf-core/setup-nextflow@v1

- uses: actions/setup-python@v4
with:
python-version: "3.8"
python-version: "3.11"
architecture: "x64"

- name: Install dependencies
Expand Down
68 changes: 68 additions & 0 deletions .github/workflows/release-announcements.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
name: release-announcements
# Automatic release toot and tweet anouncements
on:
release:
types: [published]
workflow_dispatch:

jobs:
toot:
runs-on: ubuntu-latest
steps:
- uses: rzr/fediverse-action@master
with:
access-token: ${{ secrets.MASTODON_ACCESS_TOKEN }}
host: "mstdn.science" # custom host if not "mastodon.social" (default)
# GitHub event payload
# https://docs.github.com/en/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#release
message: |
Pipeline release! ${{ github.repository }} v${{ github.event.release.tag_name }} - ${{ github.event.release.name }}!

Please see the changelog: ${{ github.event.release.html_url }}

send-tweet:
runs-on: ubuntu-latest

steps:
- uses: actions/setup-python@v4
with:
python-version: "3.10"
- name: Install dependencies
run: pip install tweepy==4.14.0
- name: Send tweet
shell: python
run: |
import os
import tweepy

client = tweepy.Client(
access_token=os.getenv("TWITTER_ACCESS_TOKEN"),
access_token_secret=os.getenv("TWITTER_ACCESS_TOKEN_SECRET"),
consumer_key=os.getenv("TWITTER_CONSUMER_KEY"),
consumer_secret=os.getenv("TWITTER_CONSUMER_SECRET"),
)
tweet = os.getenv("TWEET")
client.create_tweet(text=tweet)
env:
TWEET: |
Pipeline release! ${{ github.repository }} v${{ github.event.release.tag_name }} - ${{ github.event.release.name }}!

Please see the changelog: ${{ github.event.release.html_url }}
TWITTER_CONSUMER_KEY: ${{ secrets.TWITTER_CONSUMER_KEY }}
TWITTER_CONSUMER_SECRET: ${{ secrets.TWITTER_CONSUMER_SECRET }}
TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_ACCESS_TOKEN }}
TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}

bsky-post:
runs-on: ubuntu-latest
steps:
- uses: zentered/[email protected]
with:
post: |
Pipeline release! ${{ github.repository }} v${{ github.event.release.tag_name }} - ${{ github.event.release.name }}!

Please see the changelog: ${{ github.event.release.html_url }}
env:
BSKY_IDENTIFIER: ${{ secrets.BSKY_IDENTIFIER }}
BSKY_PASSWORD: ${{ secrets.BSKY_PASSWORD }}
#
4 changes: 3 additions & 1 deletion .gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ tasks:
command: |
pre-commit install --install-hooks
nextflow self-update

- name: unset JAVA_TOOL_OPTIONS
command: |
unset JAVA_TOOL_OPTIONS
vscode:
extensions: # based on nf-core.nf-core-extensionpack
- codezombiech.gitignore # Language support for .gitignore files
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Thank you to everyone else that has contributed by reporting bugs, enhancements
- [[#299](https://github.com/nf-core/viralrecon/issues/299)] - Add the freyja pipeline as a subworkflow
- [[PR #387](https://github.com/nf-core/viralrecon/pull/387)] - Software closes gracefully when encountering an error
- [[PR #395](https://github.com/nf-core/viralrecon/pull/395)] - Remove minia from default assemblers because it is unreliable
- [[PR #393](https://github.com/nf-core/viralrecon/pull/393)] - Changed primer set to params
- [[PR #401](https://github.com/nf-core/viralrecon/pull/401)] - Added option to add a custom annotation

### Parameters
Expand Down
2 changes: 1 addition & 1 deletion CITATIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

- [FastQC](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/)

> Andrews, S. (2010). FastQC: A Quality Control Tool for High Throughput Sequence Data [Online]. Available online https://www.bioinformatics.babraham.ac.uk/projects/fastqc/.
> Andrews, S. (2010). FastQC: A Quality Control Tool for High Throughput Sequence Data [Online](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/).

- [iVar](https://www.ncbi.nlm.nih.gov/pubmed/30621750/)

Expand Down
Loading
Loading