diff --git a/CI/get_srl_domain_information.py b/CI/get_srl_domain_information.py index 56b82f86cb7c7d0e00d76515d026487727f974f1..852aff382c8dbddf8a6b791de6cd18ad85cf2a3b 100644 --- a/CI/get_srl_domain_information.py +++ b/CI/get_srl_domain_information.py @@ -6,20 +6,20 @@ def get_srl_package_mapping(directory): srl_files = glob.glob(os.path.join(directory,"atlas-srl-*")) for f in srl_files: logging.debug("reading file '%s'" % f) - m =re.match("atlas-srl-(\w+)",os.path.basename(f)) - d = m.group(1) - logging.info("extracted domain '%s' from filename '%s'" % (d,os.path.basename(f))) + m = re.match("atlas-srl-(\w+)",os.path.basename(f)) + domain = m.group(1) + logging.info("extracted domain '%s' from filename '%s'" % (domain,os.path.basename(f))) fh = open(f) - pkgs = [p.strip() for p in fh.readlines() if p.strip()] + pkgs = [package.strip() for package in fh.readlines() if package.strip()] fh.close() logging.debug("found packages %s in file '%s'" % (str(pkgs),f)) - if not d in domains: - domains[d] = set(pkgs) + if not domain in domains: + domains[domain] = set(pkgs) else: - domains[d].update(pkgs) + domains[domain].update(pkgs) - for d,p in domains.items(): - logging.debug("domain '%s': packages = %s" % (d,str(p))) + for domain,packages in domains.items(): + logging.debug("domain '%s': packages = %s" % (domain,str(packages))) return domains @@ -32,25 +32,26 @@ def get_srl_group_members(group_def_file): for g in groups: m = re.match("atlas-srl-(\w+).*=([\w ,]+)",g) domain = m.group(1) - members = set([e.strip() for e in m.group(2).split(',')]) + expert_list = m.group(2).split(',') + members = set([e.strip() for e in expert_list]) logging.info("group '%s' consists of members %s" % (domain,members)) if not domain in experts: experts[domain] = members else: experts[domain].update(members) - for d,e in experts.items(): - logging.debug("domain '%s': experts = %s" % (d,str(e))) + for domain,expert_list in experts.items(): + logging.debug("domain '%s': experts = %s" % (domain,str(expert_list))) return experts def merge_srl_packages_experts(pkg_map,expert_map): domains = {} - for d,pkgs in pkg_map.items(): - if d in expert_map: - domains[d] = {"packages": pkgs, "experts": expert_map[d]} + for domain,pkgs in pkg_map.items(): + if domain in expert_map: + domains[domain] = {"packages": pkgs, "experts": expert_map[domain]} else: - logging.error("found package mapping for domain '%s' but no experts" % d) + logging.error("found package mapping for domain '%s' but no experts" % domain) missing = set(expert_map.keys()) - set(domains.keys()) if len(missing) > 0: @@ -72,7 +73,7 @@ def main(): # configure log output logging.basicConfig(format='%(asctime)s %(levelname)-10s %(message)s', datefmt='%H:%M:%S', - level=args.verbose) + level=logging.getLevelName(args.verbose)) # delegate packages = get_srl_package_mapping(os.path.join(args.indir,"done")) diff --git a/CI/handle_new_mr.py b/CI/handle_new_mr.py index 5753491aa7eb7ba3da38373bf6ce8716b042330b..877b4b1bcc202031a43408710a5a61e6c3569660 100644 --- a/CI/handle_new_mr.py +++ b/CI/handle_new_mr.py @@ -155,7 +155,7 @@ def main(): # configure log output logging.basicConfig(format='%(asctime)s %(levelname)-10s %(message)s', datefmt='%H:%M:%S', - level=args.verbose) + level=logging.getLevelName(args.verbose)) logging.debug("parsed arguments:\n" + repr(args)) diff --git a/CI/run_unit_tests_for_mr.py b/CI/run_unit_tests_for_mr.py index 69941af80756b7cd5c00ec4e5c92ca2c7b8bfbca..90ed068d16d051d828416e9596f8749c568f88b1 100644 --- a/CI/run_unit_tests_for_mr.py +++ b/CI/run_unit_tests_for_mr.py @@ -46,7 +46,7 @@ def main(): # configure log output logging.basicConfig(format='%(asctime)s %(levelname)-10s %(message)s', datefmt='%H:%M:%S', - level=args.verbose) + level=logging.getLevelName(args.verbose)) # delegate run_unit_tests(args)