From 866a60c9a5f544e4b354e02ad2b5d00d15e06419 Mon Sep 17 00:00:00 2001 From: "James A. Fellows Yates" Date: Fri, 26 Mar 2021 13:22:39 +0100 Subject: [PATCH 1/3] Replace max_time regex with @ewels and @kevinmenden new version --- nf_core/pipeline-template/nextflow_schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nf_core/pipeline-template/nextflow_schema.json b/nf_core/pipeline-template/nextflow_schema.json index 5cfc02abdc..eb40ed5aa0 100644 --- a/nf_core/pipeline-template/nextflow_schema.json +++ b/nf_core/pipeline-template/nextflow_schema.json @@ -192,7 +192,7 @@ "description": "Maximum amount of time that can be requested for any single job.", "default": "240.h", "fa_icon": "far fa-clock", - "pattern": "^[\\d\\.]+\\.*(s|m|h|d)$", + "pattern": "^(\\d+(\\.\\d+)?(?:\\s*|\\.?)(s|m|h|d)\\s*)+$", "hidden": true, "help_text": "Use to set an upper-limit for the time requirement for each process. Should be a string in the format integer-unit e.g. `--max_time '2.h'`" } From 455b5ef1df931b592c9dcb156cc624f1c9fb7854 Mon Sep 17 00:00:00 2001 From: "James A. Fellows Yates" Date: Fri, 26 Mar 2021 13:23:46 +0100 Subject: [PATCH 2/3] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21bd6b5e55..c51294a8cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## 1.14dev -_..nothing yet.._ +* Fix overly strict `--max_time` formatting regex [[#973](https://github.com/nf-core/tools/issues/973)] ## [v1.13.3 - Copper Crocodile Resurrection :crocodile:](https://github.com/nf-core/tools/releases/tag/1.13.2) - [2021-03-24] From 624b3609217a2aaecd26e6ad664e1fb8325c6028 Mon Sep 17 00:00:00 2001 From: Phil Ewels Date: Fri, 26 Mar 2021 14:09:10 +0100 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c91911ee04..9adef35718 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## 1.14dev * Fixed an issue in the pipeline template regarding explicit disabling of unused container engines [[#972](https://github.com/nf-core/tools/pull/972)] -* Fix overly strict `--max_time` formatting regex [[#973](https://github.com/nf-core/tools/issues/973)] +* Fix overly strict `--max_time` formatting regex in template schema [[#973](https://github.com/nf-core/tools/issues/973)] ## [v1.13.3 - Copper Crocodile Resurrection :crocodile:](https://github.com/nf-core/tools/releases/tag/1.13.2) - [2021-03-24]