Merge branch 'hotfix/1.5.3'

`+` is not allowed in file names anymore, as CWL could not "glob" an output with a `+` in its name

CHANGES.md

@@ -1,5 +1,9 @@
 # CHANGES
 
+## 1.5.3
+
+* `+` is not allowed in file names anymore, as CWL could not "glob" an output with a `+` in its name
+
 ## 1.5.2
 
 * Reject files in a manifest with characters that not compatible with CWL file name restrictions in their names.

cgp_seq_input_val/manifest.py

@@ -22,9 +22,10 @@
 VAL_LIM_CONFIG_ERROR = "'limit' and 'limit_by' must both be defined when either \
                        is present, check body.validate."
 
-# same as implemented in CWLtool. Reference: https://tinyurl.com/y3gxryu4
+# same as implemented in CWLtool. Reference: https://tinyurl.com/y3gxryu4,
+# except '+' as CWL can not glob the output when it is in output file name
 # the reference linked to the line in CWLtool repo
-CWL_EN_STRICT_RE = re.compile(r"^[a-zA-Z0-9._+-]+$")
+CWL_EN_STRICT_RE = re.compile(r"^[a-zA-Z0-9._-]+$")
 
 
 def wrapped_validate(args):
@@ -562,7 +563,7 @@ def filename_cwl_compatibility_check(self, rules: bool):
                 if not CWL_EN_STRICT_RE.match(item):
                     raise ValidationError(
                         "File has CWL imcompatible character(s) in the name: '%s' on line %d."
-                        % (item, cnt) + f"\nAcceptable pattern is: '{CWL_EN_STRICT_RE.pattern}'."
+                        % (item, cnt) + f" Acceptable pattern is: '{CWL_EN_STRICT_RE.pattern}'."
                     )
 
     def heading_check(self, config):

setup.py

@@ -9,7 +9,7 @@
     'url': 'https://github.com/cancerit/cgp_seq_input_val',
     'download_url': '',
     'author_email': '[email protected]',
-    'version': '1.5.2',
+    'version': '1.5.3',
     'python_requires': '>= 3.6',
     'setup_requires': ['pytest'],
     'install_requires': ['progressbar2', 'xlrd', 'xopen'],