Skip to content

Commit

Permalink
Merge pull request #34 from phac-nml/dev
Browse files Browse the repository at this point in the history
0.4.1 Patch Release
  • Loading branch information
sgsutcliffe authored Dec 23, 2024
2 parents 9d2649c + ab3d79d commit c810907
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 10 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
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).

## [0.4.1] - 2024-12-23

- Updating the version of `GAS` container from 0.1.1 -> [0.1.3](https://github.com/phac-nml/genomic_address_service/pull/18)

## [0.4.0] - 2024-11-07

- Added the ability to include a `sample_name` column in the input samplesheet.csv. Allows for compatibility with IRIDA-Next input configuration.
Expand Down Expand Up @@ -52,3 +56,4 @@ Initial release of the Genomic Address Service Clustering pipeline to be used fo
[0.2.0]: https://github.com/phac-nml/gasclustering/releases/tag/0.2.0
[0.3.0]: https://github.com/phac-nml/gasclustering/releases/tag/0.3.0
[0.4.0]: https://github.com/phac-nml/gasclustering/releases/tag/0.4.0
[0.4.1]: https://github.com/phac-nml/gasclustering/releases/tag/0.4.1
4 changes: 2 additions & 2 deletions modules/local/gas/mcluster/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ process GAS_MCLUSTER{
tag "Denovo Clustering"

container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/genomic_address_service%3A0.1.1--pyh7cba7a3_1' :
'biocontainers/genomic_address_service:0.1.1--pyh7cba7a3_1' }"
'https://depot.galaxyproject.org/singularity/genomic_address_service%3A0.1.3--pyh7e72e81_0' :
'biocontainers/genomic_address_service:0.1.3--pyh7e72e81_0' }"

input:
path(dist_matrix)
Expand Down
2 changes: 1 addition & 1 deletion nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ manifest {
description = """IRIDA Next Genomic Address Service Clustering Pipeline"""
mainScript = 'main.nf'
nextflowVersion = '!>=23.04.0'
version = '0.4.0'
version = '0.4.1'
doi = ''
defaultBranch = 'main'
}
Expand Down
2 changes: 1 addition & 1 deletion tests/data/clusters/expected_tree-mismatched-ids.nwk
Original file line number Diff line number Diff line change
@@ -1 +1 @@
((sampleB:0.000000,sampleA:0.000000):16.666666666666668,sampleC:33.333333);
((sampleB:0.000000,sampleA:0.000000):33.333333333333336,sampleC:33.333333);
Original file line number Diff line number Diff line change
@@ -1 +1 @@
((sampleB:0.000000,sampleA:0.000000):16.666666666666668,sample3:33.333333);
((sampleB:0.000000,sampleA:0.000000):33.333333333333336,sample3:33.333333);
2 changes: 1 addition & 1 deletion tests/data/clusters/expected_tree.nwk
Original file line number Diff line number Diff line change
@@ -1 +1 @@
((sample2:0.000000,sample1:0.000000):16.666666666666668,sample3:33.333333);
((sample2:0.000000,sample1:0.000000):33.333333333333336,sample3:33.333333);
2 changes: 1 addition & 1 deletion tests/data/clusters/expected_tree_hamming.nwk
Original file line number Diff line number Diff line change
@@ -1 +1 @@
((sample2:1.000000,sample1:1.000000):0.75,sample3:2.500000);
((sample2:1.000000,sample1:1.000000):1.5,sample3:2.500000);
Original file line number Diff line number Diff line change
@@ -1 +1 @@
((sample2:1.000000,sample1:1.000000):1.0,sample3:3.000000);
((sample2:1.000000,sample1:1.000000):2.0,sample3:3.000000);
Original file line number Diff line number Diff line change
@@ -1 +1 @@
((sample2:1.000000,sample1:1.000000):0.5,sample3:2.000000);
((sample2:1.000000,sample1:1.000000):1.0,sample3:2.000000);
2 changes: 1 addition & 1 deletion tests/data/clusters/expected_tree_hash_missing.nwk
Original file line number Diff line number Diff line change
@@ -1 +1 @@
((sample2:1.000000,sample1:1.000000):0.25,sample3:1.500000);
((sample2:1.000000,sample1:1.000000):0.5,sample3:1.500000);

0 comments on commit c810907

Please sign in to comment.