Merge branch '105_nxcalsDev0' into 'LCG_105-patches'

NXCals: allow different version strings

See merge request !2211

cmake/toolchain/nxcals.cmake

@@ -5,8 +5,8 @@ set(NXCALS_MGM_URL root://eosproject.cern.ch://)
 set(PATTERN_NXCALS_JAVA "data-access-libs")
 set(PATTERN_NXCALS_PYTHON "extraction_api_python3-")
 
-# a number followed by repeated (either a dot or rc (release candidate) or b (beta) and another number)
-set(NXCALS_VERSION_MATCH "[0-9]((\\.|rc|b)[0-9]+)+")
+# a number followed by repeated (a dot followed by numbers or letters or both)
+set(NXCALS_VERSION_MATCH "[0-9](\\.[a-z0-9]+)+")
 
 # upgrade pip for latest version
 execute_process(COMMAND $ENV{SHELL} -c "python3 -m pip install --upgrade --user pip")