# HG changeset patch # User greg # Date 1507227296 14400 # Node ID f782812220e18ca9f34b958cd823def8fe32ed59 # Parent 259901da9ed531c37dcfafa3042edc66ff346e89 Uploaded diff -r 259901da9ed5 -r f782812220e1 gene_family_aligner.xml --- a/gene_family_aligner.xml Wed Oct 04 15:05:36 2017 -0400 +++ b/gene_family_aligner.xml Thu Oct 05 14:14:56 2017 -0400 @@ -3,7 +3,9 @@ macros.xml - + + plant_tribes_gene_family_aligner + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 259901da9ed5 -r f782812220e1 macros.xml --- a/macros.xml Wed Oct 04 15:05:36 2017 -0400 +++ b/macros.xml Thu Oct 05 14:14:56 2017 -0400 @@ -1,47 +1,6 @@ 1.0 - - - plant_tribes_assembly_post_processor - - - - - plant_tribes_gene_family_aligner - - - - - plant_tribes_gene_family_classifier - - - - - plant_tribes_gene_family_integrator - - - - - plant_tribes_kaks_analysis - - - - - r-optparse - - - - - plant_tribes_gene_family_phylogeny_builder - - - - - - - - @@ -49,72 +8,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @misc{None, diff -r 259901da9ed5 -r f782812220e1 utils.py --- a/utils.py Wed Oct 04 15:05:36 2017 -0400 +++ b/utils.py Thu Oct 05 14:14:56 2017 -0400 @@ -27,7 +27,7 @@ return fstderr, fherr, fstdout, fhout -def move_directory_files(source_dir, destination_dir, copy=False): +def move_directory_files(source_dir, destination_dir, copy=False, remove_source_dir=False): source_directory = os.path.abspath(source_dir) destination_directory = os.path.abspath(destination_dir) if not os.path.isdir(destination_directory): @@ -38,6 +38,8 @@ shutil.copy(source_entry, destination_directory) else: shutil.move(source_entry, destination_directory) + if remove_source_dir: + os.rmdir(source_directory) def run_command(cmd):