f7f799d5de89bf4e10dcf27e7c656bd2039d8419 wong Fri Oct 21 11:37:53 2011 -0700 removed old testing structure, and changes name of class in mkChangenotes diff --git python/programs/mkChangeNotes/mkChangeNotes.py python/programs/mkChangeNotes/mkChangeNotes.py index dfb7323..c37d6fe 100755 --- python/programs/mkChangeNotes/mkChangeNotes.py +++ python/programs/mkChangeNotes/mkChangeNotes.py @@ -1,20 +1,20 @@ #!/hive/groups/encode/dcc/bin/python import sys, os, re, argparse, subprocess, math from ucscgenomics import ra, track -class mkChangeNotes(object): +class makeNotes(object): def checkMetaDbForFiles(self, mdb, files, status, loose): errors = [] revokedset = set() revokedfiles = set() atticset = set() supplementalset = set() filtermdb = ra.RaFile() for i in files: if re.match('supplemental', i): supplementalset.add(i) if not re.match('wgEncode.*', i): continue filestanza = mdb.filter(lambda s: re.match(".*%s.*" % i,s['fileName']), lambda s: s) @@ -474,31 +474,30 @@ output.append("\n") if len(revokedTables): output.append("Revoked Tables (%s):" % len(revokedTables)) output.extend(self.printIter(revokedTables)) output.append("\n") if len(revokedFiles): output.append("Revoked Files (%s):" % len(revokedFiles)) output.extend(self.printWithPath(revokedFiles, c, args['releaseNew'])) output.append("\n") if len(revokedGbdbs): output.append("Revoked Gbdbs (%s):" % len(revokedGbdbs)) output.extend(self.printGbdbPath(revokedGbdbs, args['database'])) output.append("\n") if not args['ignore']: output.append("No Errors") - return output def printErrors(self, errors): errorsDict = {} output = [] for i in errors: line = i.split(":", 1) try: errorsDict[line[0]].append(line[1]) except: errorsDict[line[0]] = [] errorsDict[line[0]].append(line[1]) output.append("Errors (%s):" % len(errors)) for i in sorted(errorsDict.keys()): output.append("%s:" % i) @@ -631,28 +630,25 @@ args = parser.parse_args(sys.argv[1:]) if not args.releaseNew.isdigit(): parser.print_help() return if not args.releaseOld.isdigit(): args.releaseOld = 'solo' elif int(args.releaseOld) > int(args.releaseNew): errors.append("Old Release is higher than New Release") args.releaseOld = args.releaseNew printErrors(errors) return - - c = track.CompositeTrack(args.database, args.composite) - argsdict = {'database': args.database, 'composite': args.composite, 'releaseNew': args.releaseNew, 'releaseOld': args.releaseOld, 'loose': args.loose, 'ignore': args.ignore, 'summary': args.summary} - notes = mkChangeNotes(argsdict) + notes = makeNotes(argsdict) for line in notes.output: print line if __name__ == '__main__': main()