From a561268a5f7e6d4ea37e4e7a4c7db3e76d9a135a Mon Sep 17 00:00:00 2001 From: German Giraldo Date: Thu, 14 Mar 2024 17:12:28 +0100 Subject: [PATCH] Allow digits in data tier names --- src/python/WMCore/Lexicon.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/python/WMCore/Lexicon.py b/src/python/WMCore/Lexicon.py index d14ed195db..15e15602b6 100644 --- a/src/python/WMCore/Lexicon.py +++ b/src/python/WMCore/Lexicon.py @@ -26,7 +26,7 @@ # i.e production should end with v[number] PRIMARY_DS = {'re': '^[a-zA-Z][a-zA-Z0-9\-_]*$', 'maxLength': 99} PROCESSED_DS = {'re': '[a-zA-Z0-9\.\-_]+', 'maxLength': 199} -TIER = {'re': '[A-Z\-_]+', 'maxLength': 99} +TIER = {'re': '[A-Z0-9\-_]+', 'maxLength': 99} BLOCK_STR = {'re': '#[a-zA-Z0-9\.\-_]+', 'maxLength': 100} lfnParts = { @@ -103,7 +103,7 @@ def searchblock(candidate): return check(regexp, candidate) -SEARCHDATASET_RE = r'^/(\*|[a-zA-Z\*][a-zA-Z0-9_\*\-]{0,100})(/(\*|[a-zA-Z0-9_\.\-\*]{1,199})){0,1}(/(\*|[A-Z\-\*]{1,50})){0,1}$' +SEARCHDATASET_RE = r'^/(\*|[a-zA-Z\*][a-zA-Z0-9_\*\-]{0,100})(/(\*|[a-zA-Z0-9_\.\-\*]{1,199})){0,1}(/(\*|[A-Z0-9\-\*]{1,99})){0,1}$' def searchdataset(candidate): @@ -202,7 +202,7 @@ def globalTag(candidate): return check(r'[a-zA-Z0-9\s\.\-_:]{1,100}$', candidate) -DATASET_RE = r'^/[a-zA-Z0-9\-_]{1,99}/[a-zA-Z0-9\.\-_]{1,199}/[A-Z\-]{1,50}$' +DATASET_RE = r'^/[a-zA-Z0-9\-_]{1,99}/[a-zA-Z0-9\.\-_]{1,199}/[A-Z0-9\-]{1,99}$' def dataset(candidate):