+
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
26e610c
Post-release bump version
sofstam Jan 15, 2025
4f49fde
Update CHANGELOG.md
sofstam Jan 15, 2025
2dea5b1
Prettier
sofstam Jan 15, 2025
575ef87
Merge branch 'bump_version_1.3.0' of https://github.com/nf-core/taxpr…
sofstam Jan 15, 2025
7f5a785
[automated] Fix code linting
nf-core-bot Jan 15, 2025
071bcfb
Merge pull request #568 from nf-core/bump_version_1.3.0
sofstam Jan 15, 2025
64dcb04
Template update for nf-core/tools version 3.1.2
nf-core-bot Jan 20, 2025
898866f
Merge branch 'dev' into nf-core-template-merge-3.1.2
sofstam Jan 23, 2025
ac960d4
Update nextflow.config
sofstam Jan 23, 2025
a33a73f
Update nextflow.config
sofstam Jan 23, 2025
f2226be
Update zenodo
sofstam Jan 23, 2025
3d54880
Update nextflow.config
sofstam Jan 23, 2025
8b62db7
Update README.md
jfy133 Jan 23, 2025
b8a42de
Apply suggestions from code review
jfy133 Jan 23, 2025
34c5079
Merge pull request #569 from nf-core/nf-core-template-merge-3.1.2
sofstam Jan 23, 2025
622585a
Template update for nf-core/tools version 3.2.0
nf-core-bot Jan 27, 2025
b524cb0
Merge branch 'dev' into nf-core-template-merge-3.2.0
sofstam Jan 28, 2025
f11fd27
Merge pull request #571 from nf-core/nf-core-template-merge-3.2.0
jfy133 Jan 28, 2025
22380d6
Improve docs for taxpasta related flags
jfy133 Jan 30, 2025
7415c81
Merge pull request #573 from nf-core/better-docs
jfy133 Jan 30, 2025
ec1ac99
Update CHANGELOG.md
jfy133 Jan 30, 2025
c802f6f
Include batch index in task label.
muniheart Feb 3, 2025
84b4b9c
Fix: Use db_name in process tag.
muniheart Feb 3, 2025
e981c70
Sort input channel to krakenuniq to enable task caching.
muniheart Feb 3, 2025
6f7506a
Replace collect() with toSortedList()
muniheart Feb 4, 2025
9c697c5
Update CHANGELOG.md
muniheart Feb 4, 2025
7500711
Update CHANGELOG.md
muniheart Feb 4, 2025
c3a6b58
Merge pull request #575 from nf-core/changelog-for-docschagnes
jfy133 Feb 5, 2025
184d1f8
Merge branch 'dev' into master
jfy133 Feb 12, 2025
cb510bd
Changed sort comparator to avoid type mismatch error.
muniheart Feb 12, 2025
00daff6
Replace function prefix() with closure form_prefix.
muniheart Feb 12, 2025
382c4b3
Fixed: Reinsert deleted arguments to closure.
muniheart Feb 13, 2025
c7c98e4
Satisfy linting
jfy133 Feb 13, 2025
4484e71
Fix keyword in nextflow_schema.json
mashehu Feb 13, 2025
612a94c
update changelog
mashehu Feb 13, 2025
24933cc
Merge pull request #578 from nf-core/fix-schema-keyword
mashehu Feb 13, 2025
c2a907b
Adjust list indices.
muniheart Feb 13, 2025
a2705e1
Moved sort operation.
muniheart Feb 15, 2025
ac4e54f
remove links to multiqc plots
mashehu Feb 27, 2025
593aba1
Merge pull request #579 from nf-core/remove-links-multiqc-plot
jfy133 Feb 27, 2025
e61d649
analysis_read_reads -> analysis_ready_reads
AlexHoratio Mar 3, 2025
e3e680a
space after full stop
AlexHoratio Mar 3, 2025
595ae3d
not can -> nor can
AlexHoratio Mar 3, 2025
f4f4b33
added me to README.md
AlexHoratio Mar 3, 2025
220f2c7
Merge pull request #580 from AlexHoratio/minor_typos_fix
jfy133 Mar 6, 2025
3c82ed6
Merge pull request #576 from muniheart/master
jfy133 Mar 6, 2025
07cbf7f
Add missing template updates
jfy133 Mar 11, 2025
919dbfd
add missing typo fixes
jfy133 Mar 11, 2025
5db1dc1
Merge pull request #582 from nf-core/changelog-post3.20t-tools
sofstam Mar 11, 2025
14744d4
Prelease bump version
sofstam Mar 11, 2025
acee020
[automated] Fix code linting
nf-core-bot Mar 11, 2025
29b09ae
Merge pull request #584 from sofstam/prelease-bump
sofstam Mar 11, 2025
5f947d6
fix code blocks
mashehu Mar 11, 2025
077626b
Update CHANGELOG.md
sofstam Mar 11, 2025
dc83cb9
[automated] Fix code linting
nf-core-bot Mar 11, 2025
48d4070
Merge pull request #585 from nf-core/fix-code-blocks
sofstam Mar 11, 2025
32749b6
Switch from using save_analysis_ready_reads to save_analysis_ready_fa…
epstein6 Mar 11, 2025
f417da2
Update CHANGELOG.md
epstein6 Mar 12, 2025
c2b9c18
Merge branch 'dev' into fix_docs_saves
LilyAnderssonLee Mar 12, 2025
5fbcfec
Update README.md
epstein6 Mar 12, 2025
26d0721
Merge pull request #586 from epstein6/fix_docs_saves
LilyAnderssonLee Mar 12, 2025
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
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ jobs:
steps:
- name: Check out pipeline code
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
with:
fetch-depth: 0

- name: Set up Nextflow
uses: nf-core/setup-nextflow@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linting_comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download lint results
uses: dawidd6/action-download-artifact@80620a5d27ce0ae443b965134db88467fc607b43 # v7
uses: dawidd6/action-download-artifact@20319c5641d495c8a52e688b7dc5fada6c3a9fbc # v8
with:
workflow: linting.yml
workflow_conclusion: completed
Expand Down
33 changes: 0 additions & 33 deletions .github/workflows/release-announcements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,39 +27,6 @@ jobs:

${{ steps.get_topics.outputs.topics }} #nfcore #openscience #nextflow #bioinformatics

send-tweet:
runs-on: ubuntu-latest

steps:
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
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:
Expand Down
4 changes: 2 additions & 2 deletions .nf-core.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
nf_core_version: 3.1.1
nf_core_version: 3.2.0
repository_type: pipeline
template:
author: James A. Fellows Yates, Sofia Stamouli, Moritz E. Beber, Lili Andersson-Li,
Expand All @@ -12,4 +12,4 @@ template:
outdir: .
skip_features:
- igenomes
version: 1.2.2
version: 1.2.3
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ repos:
- prettier@3.2.5

- repo: https://github.com/editorconfig-checker/editorconfig-checker.python
rev: "3.0.3"
rev: "3.1.2"
hooks:
- id: editorconfig-checker
alias: ec
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,27 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## v1.2.3 - Bouncy Basenji Patch [2024-03-13]

### `Added`

- [#576](https://github.com/nf-core/taxprofiler/pull/576) Sort input to krakenuniq to enable retrieval of cached batch tasks (❤️ to @muniheart for reporting and fix)
- [#569](https://github.com/nf-core/taxprofiler/pull/569) Updated to nf-core pipeline template v3.1.2 (added by @sofstam)
- [#571](https://github.com/nf-core/taxprofiler/pull/571) Updated to nf-core pipeline template v3.2.0 (added by @sofstam)
-

### `Fixed`

- [#580](https://github.com/nf-core/taxprofiler/pull/580) Minor documentation typo fixes (❤️ to @AlexHoratio for reporting and fix)
- [#573](https://github.com/nf-core/taxprofiler/pull/573) Improved help messages and documentation to state many of the taxpasta related params require taxonomy files to be input (❤️ to @alexhbnr for reporting, fix by @jfy133)
- [#578](https://github.com/nf-core/taxprofiler/pull/578) Fixed incorrect keyword in nextflow_schema.json (fix by @mashehu)
- [#585](https://github.com/nf-core/taxprofiler/pull/585) Fixed code blocks (fix by @masheshu)
- [#586](https://github.com/nf-core/taxprofiler/pull/586) Fixed wrong argument name for saving analysis reads (fix by @epstein6)

### `Dependencies`

### `Deprecated`

## v1.2.2 - Bouncy Basenji Patch [2024-01-15]

### `Added`
Expand Down
11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

[![GitHub Actions CI Status](https://github.com/nf-core/taxprofiler/actions/workflows/ci.yml/badge.svg)](https://github.com/nf-core/taxprofiler/actions/workflows/ci.yml)
[![GitHub Actions Linting Status](https://github.com/nf-core/taxprofiler/actions/workflows/linting.yml/badge.svg)](https://github.com/nf-core/taxprofiler/actions/workflows/linting.yml)[![AWS CI](https://img.shields.io/badge/CI%20tests-full%20size-FF9900?labelColor=000000&logo=Amazon%20AWS)](https://nf-co.re/taxprofiler/results)[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.7728364-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.7728364)

[![nf-test](https://img.shields.io/badge/unit_tests-nf--test-337ab7.svg)](https://www.nf-test.com)

[![Nextflow](https://img.shields.io/badge/nextflow%20DSL2-%E2%89%A524.04.2-23aa62.svg)](https://www.nextflow.io/)
Expand Down Expand Up @@ -58,9 +59,7 @@

First, prepare a samplesheet with your input data that looks as follows:

`samplesheet.csv`:

```csv
```csv title="samplesheet.csv"
sample,run_accession,instrument_platform,fastq_1,fastq_2,fasta
2612,run1,ILLUMINA,2612_run1_R1.fq.gz,,
2612,run2,ILLUMINA,2612_run2_R1.fq.gz,,
Expand All @@ -71,9 +70,7 @@ Each row represents a fastq file (single-end), a pair of fastq files (paired end

Additionally, you will need a database sheet that looks as follows:

`databases.csv`:

```csv
```csv title="databases.csv"
tool,db_name,db_params,db_path
kraken2,db2,--quick,/<path>/<to>/kraken2/testdb-kraken2.tar.gz
metaphlan,db1,,/<path>/<to>/metaphlan/metaphlan_database/
Expand Down Expand Up @@ -123,6 +120,8 @@ We thank the following people for their contributions to the development of this
- [Jianhong Ou](https://github.com/jianhong)
- [Rafal Stepien](https://github.com/rafalstepien)
- [Mahwash Jamy](https://github.com/mjamy)
- [Alex Caswell](https://github.com/AlexHoratio)
- [Aidan Epstein](https://github.com/epstein6)

### Acknowledgments

Expand Down
4 changes: 2 additions & 2 deletions assets/multiqc_config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
report_comment: >
This report has been generated by the <a href="https://github.com/nf-core/taxprofiler/releases/tag/1.2.2"
This report has been generated by the <a href="https://github.com/nf-core/taxprofiler/releases/tag/1.2.3"
target="_blank">nf-core/taxprofiler</a> analysis pipeline. For information about
how to interpret these results, please see the <a href="https://nf-co.re/taxprofiler/1.2.2/docs/output"
how to interpret these results, please see the <a href="https://nf-co.re/taxprofiler/1.2.3/docs/output"
target="_blank">documentation</a>.
report_section_order:
"nf-core-taxprofiler-methods-description":
Expand Down
Binary file modified assets/nf-core-taxprofiler_logo_light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions conf/modules.config
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,7 @@ process {
}

withName: KRAKENUNIQ_PRELOADEDKRAKENUNIQ {
tag = { "${meta.db_name}|${task.index}" }
ext.args = { "${meta.db_params}" }
// one run with multiple samples, so fix ID to just db name to ensure clean log name
ext.prefix = { "${meta.db_name}.krakenuniq" }
Expand Down
Binary file modified docs/images/nf-core-taxprofiler_logo_dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/nf-core-taxprofiler_logo_light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading
点击 这是indexloc提供的php浏览器服务,不要输入任何密码和下载