diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e5741b..79ef4ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ 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.3.0] - 2024-08-21 + +### Changed + +- Upgraded `locidex/merge` to version `0.2.2` and updated `input_assure` and test data for compatibility with the new `mlst.json` allele file format. + - [PR28](https://github.com/phac-nml/gasclustering/pull/28) +- Aligned container registry handling in configuration files and modules with `phac-nml/pipeline-standards` + - [PR28](https://github.com/phac-nml/gasclustering/pull/28) + ## [0.2.0] - 2024-06-26 ### Added @@ -28,3 +37,4 @@ Initial release of the Genomic Address Service Clustering pipeline to be used fo [0.1.0]: https://github.com/phac-nml/gasclustering/releases/tag/0.1.0 [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 diff --git a/assets/samplesheet.csv b/assets/samplesheet.csv index 82842ce..b283ed7 100644 --- a/assets/samplesheet.csv +++ b/assets/samplesheet.csv @@ -1,4 +1,4 @@ sample,mlst_alleles -sample1,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/sample1.mlst.json -sample2,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/sample2.mlst.json -sample3,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/sample3.mlst.json +sample1,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/sample1.mlst.json +sample2,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/sample2.mlst.json +sample3,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/sample3.mlst.json diff --git a/bin/input_assure.py b/bin/input_assure.py index d99bf2a..e2b7ac1 100755 --- a/bin/input_assure.py +++ b/bin/input_assure.py @@ -19,18 +19,22 @@ def check_inputs(json_file, sample_id, address, output_error_file, output_json_f with open_file(json_file, "rt") as f: json_data = json.load(f) + # Extract the profile from the json_data + profile = json_data.get("data", {}).get("profile", {}) + # Check for multiple keys in the JSON file and define error message + keys = sorted(profile.keys()) + original_key = keys[0] if keys else None + # Define a variable to store the match_status (True or False) - match_status = sample_id in json_data + match_status = sample_id in profile # Initialize the error message error_message = None - # Check for multiple keys in the JSON file and define error message - keys = list(json_data.keys()) - original_key = keys[0] if keys else None - - if len(keys) == 0: - error_message = f"{json_file} is completely empty!" + if not keys: + error_message = ( + f"{json_file} is missing the 'profile' section or is completely empty!" + ) print(error_message) sys.exit(1) elif len(keys) > 1: @@ -38,11 +42,11 @@ def check_inputs(json_file, sample_id, address, output_error_file, output_json_f if not match_status: error_message = f"No key in the MLST JSON file ({json_file}) matches the specified sample ID '{sample_id}'. The first key '{original_key}' has been forcefully changed to '{sample_id}' and all other keys have been removed." # Retain only the specified sample ID - json_data = {sample_id: json_data.pop(original_key)} + json_data["data"]["profile"] = {sample_id: profile.pop(original_key)} else: error_message = f"MLST JSON file ({json_file}) contains multiple keys: {keys}. The MLST JSON file has been modified to retain only the '{sample_id}' entry" - # Remove all keys expect the one matching sample_id - json_data = {sample_id: json_data[sample_id]} + # Retain only the specified sample_id in the profile + json_data["data"]["profile"] = {sample_id: profile[sample_id]} elif not match_status: # Define error message based on meta.address (query or reference) if address == "null": @@ -50,7 +54,8 @@ def check_inputs(json_file, sample_id, address, output_error_file, output_json_f else: error_message = f"Reference {sample_id} ID and JSON key in {json_file} DO NOT MATCH. The '{original_key}' key in {json_file} has been forcefully changed to '{sample_id}': User should manually check input files to ensure correctness." # Update the JSON file with the new sample ID - json_data[sample_id] = json_data.pop(original_key) + json_data["data"]["profile"] = {sample_id: profile.pop(original_key)} + json_data["data"]["sample_name"] = sample_id # Write file containing relevant error messages if error_message: diff --git a/conf/test.config b/conf/test.config index 51549ed..b0679a2 100644 --- a/conf/test.config +++ b/conf/test.config @@ -20,7 +20,7 @@ params { max_time = '1.h' // Input data - input = 'https://raw.githubusercontent.com/phac-nml/gasclustering/dev/assets/samplesheet.csv' + input = "${projectDir}/assets/samplesheet.csv" } diff --git a/modules/local/arborview.nf b/modules/local/arborview.nf index 787d8af..407468a 100644 --- a/modules/local/arborview.nf +++ b/modules/local/arborview.nf @@ -9,8 +9,8 @@ process ARBOR_VIEW { stageInMode 'copy' // Need to copy in arbor view html container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - "docker.io/python:3.11.6" : - "docker.io/python:3.11.6" }" + 'https://depot.galaxyproject.org/singularity/python%3A3.12' : + 'biocontainers/python:3.12' }" input: tuple path(tree), path(contextual_data) diff --git a/modules/local/gas/mcluster/main.nf b/modules/local/gas/mcluster/main.nf index 0ba2761..7d832bb 100644 --- a/modules/local/gas/mcluster/main.nf +++ b/modules/local/gas/mcluster/main.nf @@ -6,7 +6,7 @@ process GAS_MCLUSTER{ container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? 'https://depot.galaxyproject.org/singularity/genomic_address_service%3A0.1.1--pyh7cba7a3_1' : - 'quay.io/biocontainers/genomic_address_service:0.1.1--pyh7cba7a3_1' }" + 'biocontainers/genomic_address_service:0.1.1--pyh7cba7a3_1' }" input: path(dist_matrix) diff --git a/modules/local/locidex/merge/main.nf b/modules/local/locidex/merge/main.nf index 058d3a3..103c24f 100644 --- a/modules/local/locidex/merge/main.nf +++ b/modules/local/locidex/merge/main.nf @@ -5,8 +5,9 @@ process LOCIDEX_MERGE { label 'process_medium' container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/locidex:0.1.1--pyhdfd78af_0' : - 'quay.io/biocontainers/locidex:0.1.1--pyhdfd78af_0' }" + "docker.io/mwells14/locidex:0.2.3" : + task.ext.override_configured_container_registry != false ? 'docker.io/mwells14/locidex:0.2.3' : + 'mwells14/locidex:0.2.3' }" input: path input_values // [file(sample1), file(sample2), file(sample3), etc...] diff --git a/modules/local/profile_dists/main.nf b/modules/local/profile_dists/main.nf index 734d38d..24b3472 100644 --- a/modules/local/profile_dists/main.nf +++ b/modules/local/profile_dists/main.nf @@ -4,7 +4,8 @@ process PROFILE_DISTS{ container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? 'docker.io/mwells14/gsp:arborator_1.0.0' : - 'docker.io/mwells14/gsp:arborator_1.0.0' }" + task.ext.override_configured_container_registry != false ? 'docker.io/mwells14/gsp:arborator_1.0.0' : + 'mwells14/gsp:arborator_1.0.0' }" input: path query diff --git a/nextflow.config b/nextflow.config index 1dad6fb..a98e2dd 100644 --- a/nextflow.config +++ b/nextflow.config @@ -178,6 +178,9 @@ docker.registry = 'quay.io' podman.registry = 'quay.io' singularity.registry = 'quay.io' +// Override the default Docker registry when required +process.ext.override_configured_container_registry = true + // Nextflow plugins plugins { id 'nf-validation@1.1.3' // Validation of pipeline parameters and creation of an input channel from a sample sheet @@ -226,7 +229,7 @@ manifest { description = """IRIDA Next Genomic Address Service Clustering Pipeline""" mainScript = 'main.nf' nextflowVersion = '!>=23.04.0' - version = '0.2.0' + version = '0.3.0' doi = '' defaultBranch = 'main' } diff --git a/tests/data/reports/case-hamming/sample1.mlst.subtyping.json b/tests/data/reports/case-hamming/sample1.mlst.subtyping.json index 01bc774..63a71b4 100644 --- a/tests/data/reports/case-hamming/sample1.mlst.subtyping.json +++ b/tests/data/reports/case-hamming/sample1.mlst.subtyping.json @@ -1,7 +1,21 @@ { - "sample1": { - "l1": "1", - "l2": "1", - "l3": "1" + "db_info": {}, + "parameters": { + "mode": "normal", + "min_match_ident": 100, + "min_match_cov": 100, + "max_ambiguous": 0, + "max_internal_stops": 0 + }, + "data": { + "sample_name": "sample1", + "profile": { + "sample1": { + "l1": "1", + "l2": "1", + "l3": "1" + } + }, + "seq_data": {} } } diff --git a/tests/data/reports/case-hamming/sample2.mlst.subtyping.json b/tests/data/reports/case-hamming/sample2.mlst.subtyping.json index 1e8b0b2..704bcfe 100644 --- a/tests/data/reports/case-hamming/sample2.mlst.subtyping.json +++ b/tests/data/reports/case-hamming/sample2.mlst.subtyping.json @@ -1,7 +1,21 @@ { - "sample2": { - "l1": "1", - "l2": "2", - "l3": "1" + "db_info": {}, + "parameters": { + "mode": "normal", + "min_match_ident": 100, + "min_match_cov": 100, + "max_ambiguous": 0, + "max_internal_stops": 0 + }, + "data": { + "sample_name": "sample2", + "profile": { + "sample2": { + "l1": "1", + "l2": "2", + "l3": "1" + } + }, + "seq_data": {} } } diff --git a/tests/data/reports/case-hamming/sample3.mlst.subtyping.json b/tests/data/reports/case-hamming/sample3.mlst.subtyping.json index bec5935..7e8d7f8 100644 --- a/tests/data/reports/case-hamming/sample3.mlst.subtyping.json +++ b/tests/data/reports/case-hamming/sample3.mlst.subtyping.json @@ -1,7 +1,21 @@ { - "sample3": { - "l1": "2", - "l2": "1", - "l3": "2" + "db_info": {}, + "parameters": { + "mode": "normal", + "min_match_ident": 100, + "min_match_cov": 100, + "max_ambiguous": 0, + "max_internal_stops": 0 + }, + "data": { + "sample_name": "sample3", + "profile": { + "sample3": { + "l1": "2", + "l2": "1", + "l3": "2" + } + }, + "seq_data": {} } } diff --git a/tests/data/reports/case-hash-missing/sample1.mlst.subtyping.json b/tests/data/reports/case-hash-missing/sample1.mlst.subtyping.json index e559003..eb8c116 100644 --- a/tests/data/reports/case-hash-missing/sample1.mlst.subtyping.json +++ b/tests/data/reports/case-hash-missing/sample1.mlst.subtyping.json @@ -1,7 +1,21 @@ { - "sample1": { - "l1": "b026324c6904b2a9cb4b88d6d61c81d1", - "l2": "b026324c6904b2a9cb4b88d6d61c81d1", - "l3": "b026324c6904b2a9cb4b88d6d61c81d1" + "db_info": {}, + "parameters": { + "mode": "normal", + "min_match_ident": 100, + "min_match_cov": 100, + "max_ambiguous": 0, + "max_internal_stops": 0 + }, + "data": { + "sample_name": "sample1", + "profile": { + "sample1": { + "l1": "b026324c6904b2a9cb4b88d6d61c81d1", + "l2": "b026324c6904b2a9cb4b88d6d61c81d1", + "l3": "b026324c6904b2a9cb4b88d6d61c81d1" + } + }, + "seq_data": {} } } diff --git a/tests/data/reports/case-hash-missing/sample2.mlst.subtyping.json b/tests/data/reports/case-hash-missing/sample2.mlst.subtyping.json index 06148ce..ee75b74 100644 --- a/tests/data/reports/case-hash-missing/sample2.mlst.subtyping.json +++ b/tests/data/reports/case-hash-missing/sample2.mlst.subtyping.json @@ -1,7 +1,21 @@ { - "sample2": { - "l1": "-", - "l2": "26ab0db90d72e28ad0ba1e22ee510510", - "l3": "b026324c6904b2a9cb4b88d6d61c81d1" + "db_info": {}, + "parameters": { + "mode": "normal", + "min_match_ident": 100, + "min_match_cov": 100, + "max_ambiguous": 0, + "max_internal_stops": 0 + }, + "data": { + "sample_name": "sample2", + "profile": { + "sample2": { + "l1": "-", + "l2": "26ab0db90d72e28ad0ba1e22ee510510", + "l3": "b026324c6904b2a9cb4b88d6d61c81d1" + } + }, + "seq_data": {} } } diff --git a/tests/data/reports/case-hash-missing/sample3-more-missing.mlst.subtyping.json b/tests/data/reports/case-hash-missing/sample3-more-missing.mlst.subtyping.json index 7546de9..0bf1372 100644 --- a/tests/data/reports/case-hash-missing/sample3-more-missing.mlst.subtyping.json +++ b/tests/data/reports/case-hash-missing/sample3-more-missing.mlst.subtyping.json @@ -1,7 +1,21 @@ { - "sample3": { - "l1": "-", - "l2": "-", - "l3": "26ab0db90d72e28ad0ba1e22ee510510" + "db_info": {}, + "parameters": { + "mode": "normal", + "min_match_ident": 100, + "min_match_cov": 100, + "max_ambiguous": 0, + "max_internal_stops": 0 + }, + "data": { + "sample_name": "sample3", + "profile": { + "sample3": { + "l1": "-", + "l2": "-", + "l3": "26ab0db90d72e28ad0ba1e22ee510510" + } + }, + "seq_data": {} } } diff --git a/tests/data/reports/case-hash-missing/sample3.mlst.subtyping.json b/tests/data/reports/case-hash-missing/sample3.mlst.subtyping.json index a0f0259..fe8441d 100644 --- a/tests/data/reports/case-hash-missing/sample3.mlst.subtyping.json +++ b/tests/data/reports/case-hash-missing/sample3.mlst.subtyping.json @@ -1,7 +1,21 @@ { - "sample3": { - "l1": "-", - "l2": "b026324c6904b2a9cb4b88d6d61c81d1", - "l3": "26ab0db90d72e28ad0ba1e22ee510510" + "db_info": {}, + "parameters": { + "mode": "normal", + "min_match_ident": 100, + "min_match_cov": 100, + "max_ambiguous": 0, + "max_internal_stops": 0 + }, + "data": { + "sample_name": "sample3", + "profile": { + "sample3": { + "l1": "-", + "l2": "b026324c6904b2a9cb4b88d6d61c81d1", + "l3": "26ab0db90d72e28ad0ba1e22ee510510" + } + }, + "seq_data": {} } } diff --git a/tests/data/reports/sample1.mlst.json b/tests/data/reports/sample1.mlst.json index 01bc774..63a71b4 100644 --- a/tests/data/reports/sample1.mlst.json +++ b/tests/data/reports/sample1.mlst.json @@ -1,7 +1,21 @@ { - "sample1": { - "l1": "1", - "l2": "1", - "l3": "1" + "db_info": {}, + "parameters": { + "mode": "normal", + "min_match_ident": 100, + "min_match_cov": 100, + "max_ambiguous": 0, + "max_internal_stops": 0 + }, + "data": { + "sample_name": "sample1", + "profile": { + "sample1": { + "l1": "1", + "l2": "1", + "l3": "1" + } + }, + "seq_data": {} } } diff --git a/tests/data/reports/sample2.mlst.json b/tests/data/reports/sample2.mlst.json index 7c0426c..3d9ee23 100644 --- a/tests/data/reports/sample2.mlst.json +++ b/tests/data/reports/sample2.mlst.json @@ -1,7 +1,21 @@ { - "sample2": { - "l1": "1", - "l2": "1", - "l3": "1" + "db_info": {}, + "parameters": { + "mode": "normal", + "min_match_ident": 100, + "min_match_cov": 100, + "max_ambiguous": 0, + "max_internal_stops": 0 + }, + "data": { + "sample_name": "sample2", + "profile": { + "sample2": { + "l1": "1", + "l2": "1", + "l3": "1" + } + }, + "seq_data": {} } } diff --git a/tests/data/reports/sample3.mlst.json b/tests/data/reports/sample3.mlst.json index 43ea3c7..d57ee75 100644 --- a/tests/data/reports/sample3.mlst.json +++ b/tests/data/reports/sample3.mlst.json @@ -1,7 +1,21 @@ { - "sample3": { - "l1": "1", - "l2": "1", - "l3": "2" + "db_info": {}, + "parameters": { + "mode": "normal", + "min_match_ident": 100, + "min_match_cov": 100, + "max_ambiguous": 0, + "max_internal_stops": 0 + }, + "data": { + "sample_name": "sample3", + "profile": { + "sample3": { + "l1": "1", + "l2": "1", + "l3": "2" + } + }, + "seq_data": {} } } diff --git a/tests/data/samplesheets/samplesheet-hamming.csv b/tests/data/samplesheets/samplesheet-hamming.csv index d18a69c..df78ac4 100644 --- a/tests/data/samplesheets/samplesheet-hamming.csv +++ b/tests/data/samplesheets/samplesheet-hamming.csv @@ -1,4 +1,4 @@ sample,mlst_alleles,metadata_1,metadata_2,metadata_3,metadata_4,metadata_5,metadata_6,metadata_7,metadata_8 -sample1,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/case-hamming/sample1.mlst.subtyping.json,,,,,,,, -sample2,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/case-hamming/sample2.mlst.subtyping.json,,,,,,,, -sample3,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/case-hamming/sample3.mlst.subtyping.json,,,,,,,, +sample1,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/case-hamming/sample1.mlst.subtyping.json,,,,,,,, +sample2,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/case-hamming/sample2.mlst.subtyping.json,,,,,,,, +sample3,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/case-hamming/sample3.mlst.subtyping.json,,,,,,,, diff --git a/tests/data/samplesheets/samplesheet-hash-missing.csv b/tests/data/samplesheets/samplesheet-hash-missing.csv index 9355c3d..6ad5929 100644 --- a/tests/data/samplesheets/samplesheet-hash-missing.csv +++ b/tests/data/samplesheets/samplesheet-hash-missing.csv @@ -1,4 +1,4 @@ sample,mlst_alleles,metadata_1,metadata_2,metadata_3,metadata_4,metadata_5,metadata_6,metadata_7,metadata_8 -sample1,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/case-hash-missing/sample1.mlst.subtyping.json,,,,,,,, -sample2,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/case-hash-missing/sample2.mlst.subtyping.json,,,,,,,, -sample3,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/case-hash-missing/sample3.mlst.subtyping.json,,,,,,,, +sample1,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/case-hash-missing/sample1.mlst.subtyping.json,,,,,,,, +sample2,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/case-hash-missing/sample2.mlst.subtyping.json,,,,,,,, +sample3,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/case-hash-missing/sample3.mlst.subtyping.json,,,,,,,, diff --git a/tests/data/samplesheets/samplesheet-hash-more-missing.csv b/tests/data/samplesheets/samplesheet-hash-more-missing.csv index ae223fb..37f051f 100644 --- a/tests/data/samplesheets/samplesheet-hash-more-missing.csv +++ b/tests/data/samplesheets/samplesheet-hash-more-missing.csv @@ -1,4 +1,4 @@ sample,mlst_alleles,metadata_1,metadata_2,metadata_3,metadata_4,metadata_5,metadata_6,metadata_7,metadata_8 -sample1,https://raw.githubusercontent.com/phac-nml/gasclustering/update/profile_dists/tests/data/reports/case-hash-missing/sample1.mlst.subtyping.json,,,,,,,, -sample2,https://raw.githubusercontent.com/phac-nml/gasclustering/update/profile_dists/tests/data/reports/case-hash-missing/sample2.mlst.subtyping.json,,,,,,,, -sample3,https://raw.githubusercontent.com/phac-nml/gasclustering/update/profile_dists/tests/data/reports/case-hash-missing/sample3-more-missing.mlst.subtyping.json,,,,,,,, +sample1,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/case-hash-missing/sample1.mlst.subtyping.json,,,,,,,, +sample2,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/case-hash-missing/sample2.mlst.subtyping.json,,,,,,,, +sample3,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/case-hash-missing/sample3-more-missing.mlst.subtyping.json,,,,,,,, diff --git a/tests/data/samplesheets/samplesheet-little-metadata.csv b/tests/data/samplesheets/samplesheet-little-metadata.csv index 3e721de..052b4b3 100644 --- a/tests/data/samplesheets/samplesheet-little-metadata.csv +++ b/tests/data/samplesheets/samplesheet-little-metadata.csv @@ -1,4 +1,4 @@ sample,mlst_alleles,metadata_1,metadata_2,metadata_3,metadata_4,metadata_5,metadata_6,metadata_7,metadata_8 -sample1,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/sample1.mlst.json,,,,1.4,,,, -sample2,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/sample2.mlst.json,,,,,,,, -sample3,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/sample3.mlst.json,3.1,3.2,,,,,,3.8 +sample1,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/sample1.mlst.json,,,,1.4,,,, +sample2,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/sample2.mlst.json,,,,,,,, +sample3,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/sample3.mlst.json,3.1,3.2,,,,,,3.8 diff --git a/tests/data/samplesheets/samplesheet-mismatched-ids.csv b/tests/data/samplesheets/samplesheet-mismatched-ids.csv index 632768d..6df7315 100644 --- a/tests/data/samplesheets/samplesheet-mismatched-ids.csv +++ b/tests/data/samplesheets/samplesheet-mismatched-ids.csv @@ -1,4 +1,4 @@ sample,mlst_alleles,metadata_1,metadata_2,metadata_3,metadata_4,metadata_5,metadata_6,metadata_7,metadata_8 -sampleA,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/sample1.mlst.json,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8 -sampleB,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/sample2.mlst.json,2.1,2.2,2.3,2.4,2.5,2.6,2.7,2.8 -sampleC,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/sample3.mlst.json,3.1,3.2,3.3,3.4,3.5,3.6,3.7,3.8 +sampleA,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/sample1.mlst.json,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8 +sampleB,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/sample2.mlst.json,2.1,2.2,2.3,2.4,2.5,2.6,2.7,2.8 +sampleC,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/sample3.mlst.json,3.1,3.2,3.3,3.4,3.5,3.6,3.7,3.8 diff --git a/tests/data/samplesheets/samplesheet-no-metadata.csv b/tests/data/samplesheets/samplesheet-no-metadata.csv index 9d67864..5f4d2ca 100644 --- a/tests/data/samplesheets/samplesheet-no-metadata.csv +++ b/tests/data/samplesheets/samplesheet-no-metadata.csv @@ -1,4 +1,4 @@ sample,mlst_alleles,metadata_1,metadata_2,metadata_3,metadata_4,metadata_5,metadata_6,metadata_7,metadata_8 -sample1,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/sample1.mlst.json,,,,,,,, -sample2,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/sample2.mlst.json,,,,,,,, -sample3,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/sample3.mlst.json,,,,,,,, +sample1,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/sample1.mlst.json,,,,,,,, +sample2,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/sample2.mlst.json,,,,,,,, +sample3,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/sample3.mlst.json,,,,,,,, diff --git a/tests/data/samplesheets/samplesheet-partial-mismatched-ids.csv b/tests/data/samplesheets/samplesheet-partial-mismatched-ids.csv index d5d42f0..cd0655d 100644 --- a/tests/data/samplesheets/samplesheet-partial-mismatched-ids.csv +++ b/tests/data/samplesheets/samplesheet-partial-mismatched-ids.csv @@ -1,4 +1,4 @@ sample,mlst_alleles,metadata_1,metadata_2,metadata_3,metadata_4,metadata_5,metadata_6,metadata_7,metadata_8 -sampleA,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/sample1.mlst.json,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8 -sampleB,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/sample2.mlst.json,2.1,2.2,2.3,2.4,2.5,2.6,2.7,2.8 -sample3,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/sample3.mlst.json,3.1,3.2,3.3,3.4,3.5,3.6,3.7,3.8 +sampleA,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/sample1.mlst.json,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8 +sampleB,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/sample2.mlst.json,2.1,2.2,2.3,2.4,2.5,2.6,2.7,2.8 +sample3,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/sample3.mlst.json,3.1,3.2,3.3,3.4,3.5,3.6,3.7,3.8 diff --git a/tests/data/samplesheets/samplesheet-tabs.csv b/tests/data/samplesheets/samplesheet-tabs.csv index 56b4243..4408655 100644 --- a/tests/data/samplesheets/samplesheet-tabs.csv +++ b/tests/data/samplesheets/samplesheet-tabs.csv @@ -1,4 +1,4 @@ sample,mlst_alleles,metadata_1,metadata_2,metadata_3,metadata_4,metadata_5,metadata_6,metadata_7,metadata_8 -sample1,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/sample1.mlst.json,a b,,,,,,, -sample2,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/sample2.mlst.json,,,,a b,,,, -sample3,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/sample3.mlst.json,,,,,,,,a b +sample1,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/sample1.mlst.json,a b,,,,,,, +sample2,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/sample2.mlst.json,,,,a b,,,, +sample3,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/sample3.mlst.json,,,,,,,,a b diff --git a/tests/data/samplesheets/samplesheet1.csv b/tests/data/samplesheets/samplesheet1.csv index 3200344..f78cff3 100644 --- a/tests/data/samplesheets/samplesheet1.csv +++ b/tests/data/samplesheets/samplesheet1.csv @@ -1,4 +1,4 @@ sample,mlst_alleles,metadata_1,metadata_2,metadata_3,metadata_4,metadata_5,metadata_6,metadata_7,metadata_8 -sample1,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/sample1.mlst.json,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8 -sample2,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/sample2.mlst.json,2.1,2.2,2.3,2.4,2.5,2.6,2.7,2.8 -sample3,https://raw.githubusercontent.com/phac-nml/gasclustering/dev/tests/data/reports/sample3.mlst.json,3.1,3.2,3.3,3.4,3.5,3.6,3.7,3.8 +sample1,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/sample1.mlst.json,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8 +sample2,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/sample2.mlst.json,2.1,2.2,2.3,2.4,2.5,2.6,2.7,2.8 +sample3,https://raw.githubusercontent.com/phac-nml/gasclustering/update/input_assure/tests/data/reports/sample3.mlst.json,3.1,3.2,3.3,3.4,3.5,3.6,3.7,3.8