Skip to content

Commit 3bb9be3

Browse files
committed
change default of --sample_inference from independent to pooled
1 parent 6506a63 commit 3bb9be3

20 files changed

Lines changed: 38 additions & 19 deletions

CHANGELOG.md

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1414
### `Changed`
1515

1616
- [#1018](https://github.com/nf-core/ampliseq/pull/1018) - Change version to 2.19.0dev (by @d4straub)
17-
18-
| previously | now | comment |
19-
| ----------------- | ------------------------------ | ------- |
20-
| --nanopore | --sequencing_type nanopore | |
21-
| --pacbio | --sequencing_type pacbio | |
22-
| --iontorrent | --sequencing_type nanopore | |
23-
| --single_end | --sequencing_type illumina_se | |
24-
| default | --sequencing_type illumina_pe | default |
25-
| | --asv_calling auto | default |
26-
| default | --asv_calling dada2 | new |
27-
| | --asv_calling savont | new |
28-
| --illumina_pe_its | --illumina_pe_readthrough | |
29-
| --extension | --input_folder_extensions | |
17+
- [#1027](https://github.com/nf-core/ampliseq/pull/1027) - Changed parameters, including the default of `--sample_inference` from `independent` to `pooled` (by @d4straub)
18+
19+
| previously | now | comment |
20+
| ----------------- | ----------------------------- | ------- |
21+
| --nanopore | --sequencing_type nanopore | |
22+
| --pacbio | --sequencing_type pacbio | |
23+
| --iontorrent | --sequencing_type nanopore | |
24+
| --single_end | --sequencing_type illumina_se | |
25+
| default | --sequencing_type illumina_pe | default |
26+
| | --asv_calling auto | default |
27+
| default | --asv_calling dada2 | new |
28+
| | --asv_calling savont | new |
29+
| --illumina_pe_its | --illumina_pe_readthrough | |
30+
| --extension | --input_folder_extensions | |
3031

3132
### `Fixed`
3233

conf/test.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ params {
3131
cut_dada_ref_taxonomy = true
3232
qiime_ref_taxonomy = "greengenes85"
3333

34+
// ASV generation
35+
sample_inference = "independent"
36+
3437
// ASV postprocessing
3538
vsearch_cluster = true
3639
decontam = "decontaminate"

conf/test_doubleprimers.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ params {
2727
RV_primer = "GACTACHVGGGTATCTAATCC"
2828
double_primer = true
2929
input = params.pipelines_testdata_base_path + "ampliseq/samplesheets/Samplesheet_double_primer.tsv"
30+
sample_inference = "independent"
3031
trunc_qmin = 30
3132
kraken2_ref_taxonomy = "greengenes"
3233

conf/test_failed.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ params {
2727
RV_primer = "GGACTACNVGGGTWTCTAAT"
2828
input = params.pipelines_testdata_base_path + "ampliseq/samplesheets/Samplesheet_failed_sample.tsv"
2929
metadata = params.pipelines_testdata_base_path + "ampliseq/samplesheets/Metadata_failed_sample.tsv"
30+
sample_inference = "independent"
3031
dada_ref_tax_custom = "https://zenodo.org/records/4310151/files/rdp_train_set_18.fa.gz"
3132
skip_dada_addspecies = true
3233
cut_dada_ref_taxonomy = true

conf/test_full.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ params {
1919
RV_primer = "GGACTACNVGGGTWTCTAAT"
2020
input = params.pipelines_testdata_base_path + "ampliseq/samplesheets/Samplesheet_full.tsv"
2121
metadata = params.pipelines_testdata_base_path + "ampliseq/samplesheets/Metadata_full.tsv"
22+
sample_inference = "independent"
2223
dada_ref_taxonomy = "sbdi-gtdb"
2324
run_pplace = true
2425
qiime_ref_taxonomy = "greengenes85"

conf/test_glosed.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ params {
2525
FW_primer = "GTGYCAGCMGCCGCGGTAA"
2626
RV_primer = "GGACTACNVGGGTWTCTAAT"
2727
input = params.pipelines_testdata_base_path + "ampliseq/samplesheets/Samplesheet.tsv"
28+
sample_inference = "independent"
2829
dada_ref_taxonomy = "glosed"
2930
skip_qiime = true
3031

conf/test_iontorrent.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ params {
2929
sintax_assign_taxlevels = "Domain,Phylum,Class,Order,Family,Genus,Species"
3030
input = params.pipelines_testdata_base_path + "ampliseq/samplesheets/Samplesheet_it_SE_ITS.tsv"
3131
sequencing_type = "iontorrent"
32+
sample_inference = "independent"
3233
max_ee = 5
3334
skip_qiime = true
3435

conf/test_multi.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ params {
2323
config_profile_description = 'Test dataset for multiple sequencing runs to check pipeline function'
2424

2525
// Input data
26+
sample_inference = "independent"
2627
skip_cutadapt = true
2728
trunclenf = 200
2829
trunclenr = 150

conf/test_multiregion.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ params {
2727
metadata = params.pipelines_testdata_base_path + "ampliseq/samplesheets/metadata_multiregion.tsv"
2828
multiregion = params.pipelines_testdata_base_path + "ampliseq/samplesheets/regions_multiregion.tsv"
2929
sidle_ref_taxonomy = "greengenes88"
30+
sample_inference = "independent"
3031

3132
// Prevent default taxonomic classification
3233
skip_dada_taxonomy = true

conf/test_novaseq.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ params {
2525
// Input data
2626
input = params.pipelines_testdata_base_path + "ampliseq/samplesheets/Samplesheet_novaseq.tsv"
2727
binned_quality = "2,11,25,37"
28+
sample_inference = "independent"
2829

2930
// Test consensus merging
3031
mergepairs_strategy = "consensus"

0 commit comments

Comments
 (0)