From 7596ce1926649e0de5201d49d3b0018e044bd6c1 Mon Sep 17 00:00:00 2001 From: gregdenay Date: Mon, 23 Oct 2023 15:42:09 +0200 Subject: [PATCH] Relaxed regex for sample naming, subsample number now accepts tow to many digits (eg. 2023-0001254-01 or 2023-0001254-5236) --- CHANGELOG.md | 4 ++++ VERSION | 2 +- workflow/schema/metadata.schema.json | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 466d50b..7abb81e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### 0.2.1 + +Relaxed regex for sample naming, subsample number now accepts tow to many digits (eg. 2023-0001254-01 or 2023-0001254-5236) + ### 0.2.0 The workflow will expect fastq to be named after either the value of the `isolate_name_alt` if it is filled diff --git a/VERSION b/VERSION index 341cf11..7dff5b8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.2.0 \ No newline at end of file +0.2.1 \ No newline at end of file diff --git a/workflow/schema/metadata.schema.json b/workflow/schema/metadata.schema.json index 8adca98..5b03716 100644 --- a/workflow/schema/metadata.schema.json +++ b/workflow/schema/metadata.schema.json @@ -22,11 +22,11 @@ "properties": { "isolate_id": { "type": "string", - "pattern": "^(19[9-9][0-9]|2[0-1][0-4][0-9]|2150)-[0-9]{7}(-[0-9]{2})?$" + "pattern": "^(19[9-9][0-9]|2[0-1][0-4][0-9]|2150)-[0-9]{7}(-[0-9]{2,})?$" }, "sample_id": { "type": "string", - "pattern": "^(19[9-9][0-9]|2[0-1][0-4][0-9]|2150)-[0-9]{7}(-[0-9]{2})?$" + "pattern": "^(19[9-9][0-9]|2[0-1][0-4][0-9]|2150)-[0-9]{7}(-[0-9]{2,})?$" }, "organism": { "type": "string",