Skip to content

Commit 970bdc2

Browse files
authored
Merge pull request #583 from nf-core/dev
v1.2.3 - Bouncy Basenji Patch PR
2 parents 80d2fcc + 26d0721 commit 970bdc2

25 files changed

+122
-136
lines changed

.github/workflows/ci.yml

+2
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ jobs:
5757
steps:
5858
- name: Check out pipeline code
5959
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
60+
with:
61+
fetch-depth: 0
6062

6163
- name: Set up Nextflow
6264
uses: nf-core/setup-nextflow@v2

.github/workflows/linting_comment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Download lint results
14-
uses: dawidd6/action-download-artifact@80620a5d27ce0ae443b965134db88467fc607b43 # v7
14+
uses: dawidd6/action-download-artifact@20319c5641d495c8a52e688b7dc5fada6c3a9fbc # v8
1515
with:
1616
workflow: linting.yml
1717
workflow_conclusion: completed

.github/workflows/release-announcements.yml

-33
Original file line numberDiff line numberDiff line change
@@ -27,39 +27,6 @@ jobs:
2727
2828
${{ steps.get_topics.outputs.topics }} #nfcore #openscience #nextflow #bioinformatics
2929
30-
send-tweet:
31-
runs-on: ubuntu-latest
32-
33-
steps:
34-
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
35-
with:
36-
python-version: "3.10"
37-
- name: Install dependencies
38-
run: pip install tweepy==4.14.0
39-
- name: Send tweet
40-
shell: python
41-
run: |
42-
import os
43-
import tweepy
44-
45-
client = tweepy.Client(
46-
access_token=os.getenv("TWITTER_ACCESS_TOKEN"),
47-
access_token_secret=os.getenv("TWITTER_ACCESS_TOKEN_SECRET"),
48-
consumer_key=os.getenv("TWITTER_CONSUMER_KEY"),
49-
consumer_secret=os.getenv("TWITTER_CONSUMER_SECRET"),
50-
)
51-
tweet = os.getenv("TWEET")
52-
client.create_tweet(text=tweet)
53-
env:
54-
TWEET: |
55-
Pipeline release! ${{ github.repository }} v${{ github.event.release.tag_name }} - ${{ github.event.release.name }}!
56-
57-
Please see the changelog: ${{ github.event.release.html_url }}
58-
TWITTER_CONSUMER_KEY: ${{ secrets.TWITTER_CONSUMER_KEY }}
59-
TWITTER_CONSUMER_SECRET: ${{ secrets.TWITTER_CONSUMER_SECRET }}
60-
TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_ACCESS_TOKEN }}
61-
TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}
62-
6330
bsky-post:
6431
runs-on: ubuntu-latest
6532
steps:

.nf-core.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
nf_core_version: 3.1.1
1+
nf_core_version: 3.2.0
22
repository_type: pipeline
33
template:
44
author: James A. Fellows Yates, Sofia Stamouli, Moritz E. Beber, Lili Andersson-Li,
@@ -12,4 +12,4 @@ template:
1212
outdir: .
1313
skip_features:
1414
- igenomes
15-
version: 1.2.2
15+
version: 1.2.3

.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ repos:
77
88

99
- repo: https://github.com/editorconfig-checker/editorconfig-checker.python
10-
rev: "3.0.3"
10+
rev: "3.1.2"
1111
hooks:
1212
- id: editorconfig-checker
1313
alias: ec

CHANGELOG.md

+21
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,27 @@
33
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
44
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
55

6+
## v1.2.3 - Bouncy Basenji Patch [2024-03-13]
7+
8+
### `Added`
9+
10+
- [#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)
11+
- [#569](https://github.com/nf-core/taxprofiler/pull/569) Updated to nf-core pipeline template v3.1.2 (added by @sofstam)
12+
- [#571](https://github.com/nf-core/taxprofiler/pull/571) Updated to nf-core pipeline template v3.2.0 (added by @sofstam)
13+
-
14+
15+
### `Fixed`
16+
17+
- [#580](https://github.com/nf-core/taxprofiler/pull/580) Minor documentation typo fixes (❤️ to @AlexHoratio for reporting and fix)
18+
- [#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)
19+
- [#578](https://github.com/nf-core/taxprofiler/pull/578) Fixed incorrect keyword in nextflow_schema.json (fix by @mashehu)
20+
- [#585](https://github.com/nf-core/taxprofiler/pull/585) Fixed code blocks (fix by @masheshu)
21+
- [#586](https://github.com/nf-core/taxprofiler/pull/586) Fixed wrong argument name for saving analysis reads (fix by @epstein6)
22+
23+
### `Dependencies`
24+
25+
### `Deprecated`
26+
627
## v1.2.2 - Bouncy Basenji Patch [2024-01-15]
728

829
### `Added`

README.md

+5-6
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
[![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)
99
[![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)
10+
1011
[![nf-test](https://img.shields.io/badge/unit_tests-nf--test-337ab7.svg)](https://www.nf-test.com)
1112

1213
[![Nextflow](https://img.shields.io/badge/nextflow%20DSL2-%E2%89%A524.04.2-23aa62.svg)](https://www.nextflow.io/)
@@ -58,9 +59,7 @@
5859
5960
First, prepare a samplesheet with your input data that looks as follows:
6061

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

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

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

127126
### Acknowledgments
128127

assets/multiqc_config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
report_comment: >
2-
This report has been generated by the <a href="https://github.com/nf-core/taxprofiler/releases/tag/1.2.2"
2+
This report has been generated by the <a href="https://github.com/nf-core/taxprofiler/releases/tag/1.2.3"
33
target="_blank">nf-core/taxprofiler</a> analysis pipeline. For information about
4-
how to interpret these results, please see the <a href="https://nf-co.re/taxprofiler/1.2.2/docs/output"
4+
how to interpret these results, please see the <a href="https://nf-co.re/taxprofiler/1.2.3/docs/output"
55
target="_blank">documentation</a>.
66
report_section_order:
77
"nf-core-taxprofiler-methods-description":
-25 Bytes
Loading

conf/modules.config

+1
Original file line numberDiff line numberDiff line change
@@ -603,6 +603,7 @@ process {
603603
}
604604

605605
withName: KRAKENUNIQ_PRELOADEDKRAKENUNIQ {
606+
tag = { "${meta.db_name}|${task.index}" }
606607
ext.args = { "${meta.db_params}" }
607608
// one run with multiple samples, so fix ID to just db name to ensure clean log name
608609
ext.prefix = { "${meta.db_name}.krakenuniq" }
200 Bytes
Loading
41 Bytes
Loading

0 commit comments

Comments
 (0)