# HG changeset patch # User dfornika # Date 1571854867 14400 # Node ID ffeb852407d652a873d699aee703336c97e3540a # Parent f005b6efd096e8e44253149874fa53aafd0d2a15 "planemo upload for repository https://github.com/dfornika/galaxytools/tree/master/data_managers/data_manager_build_kraken2_database/ commit 6f21145d4103d33c227f52dc55a7d3dcf52f4f5d-dirty" diff -r f005b6efd096 -r ffeb852407d6 data_manager/kraken2_build_database.py --- a/data_manager/kraken2_build_database.py Fri May 24 13:39:08 2019 -0400 +++ b/data_manager/kraken2_build_database.py Wed Oct 23 14:21:07 2019 -0400 @@ -83,13 +83,14 @@ subprocess.check_call(['kraken2-build'] + args, cwd=target_directory) - args = [ - '--threads', str(kraken2_args["threads"]), - '--clean', - '--db', database_path - ] + if kraken2_args["clean"]: + args = [ + '--threads', str(kraken2_args["threads"]), + '--clean', + '--db', database_path + ] - subprocess.check_call(['kraken2-build'] + args, cwd=target_directory) + subprocess.check_call(['kraken2-build'] + args, cwd=target_directory) data_table_entry = { 'data_tables': { @@ -195,13 +196,14 @@ subprocess.check_call(['kraken2-build'] + args, cwd=target_directory) - args = [ - '--threads', str(kraken2_args["threads"]), - '--clean', - '--db', database_path - ] + if kraken2_args["clean"]: + args = [ + '--threads', str(kraken2_args["threads"]), + '--clean', + '--db', database_path + ] - subprocess.check_call(['kraken2-build'] + args, cwd=target_directory) + subprocess.check_call(['kraken2-build'] + args, cwd=target_directory) data_table_entry = { 'data_tables': { @@ -250,13 +252,14 @@ subprocess.check_call(['kraken2-build'] + args, cwd=target_directory) - args = [ - '--threads', str(kraken2_args["threads"]), - '--clean', - '--db', custom_database_name - ] + if kraken2_args["clean"]: + args = [ + '--threads', str(kraken2_args["threads"]), + '--clean', + '--db', custom_database_name + ] - subprocess.check_call(['kraken2-build'] + args, cwd=target_directory) + subprocess.check_call(['kraken2-build'] + args, cwd=target_directory) data_table_entry = { 'data_tables': { @@ -286,6 +289,7 @@ parser.add_argument('--custom-fasta', dest='custom_fasta', help='fasta file for custom database (only applies to --database-type custom)') parser.add_argument('--custom-database-name', dest='custom_database_name', help='Name for custom database (only applies to --database-type custom)') parser.add_argument('--skip-maps', dest='skip_maps', action='store_true', help='') + parser.add_argument('--clean', dest='clean', action='store_true', help='Clean up extra files') args = parser.parse_args() data_manager_input = json.loads(open(args.data_manager_json).read()) @@ -308,6 +312,7 @@ "minimizer_len": args.minimizer_len, "minimizer_spaces": args.minimizer_spaces, "threads": args.threads, + "clean": args.clean, } data_manager_output = kraken2_build_standard( kraken2_args, @@ -325,6 +330,7 @@ "minimizer_len": args.minimizer_len, "minimizer_spaces": args.minimizer_spaces, "threads": args.threads, + "clean": args.clean, } data_manager_output = kraken2_build_special( kraken2_args, @@ -338,6 +344,7 @@ "minimizer_len": args.minimizer_len, "minimizer_spaces": args.minimizer_spaces, "threads": args.threads, + "clean": args.clean, } data_manager_output = kraken2_build_custom( kraken2_args, diff -r f005b6efd096 -r ffeb852407d6 data_manager/kraken2_build_database.xml --- a/data_manager/kraken2_build_database.xml Fri May 24 13:39:08 2019 -0400 +++ b/data_manager/kraken2_build_database.xml Wed Oct 23 14:21:07 2019 -0400 @@ -1,10 +1,11 @@ - + + database builder @@ -24,12 +25,14 @@ --kmer-len ${database_type.kmer_len} --minimizer-len ${database_type.minimizer_len} --minimizer-spaces ${database_type.minimizer_spaces} + ${database_type.clean} #else if $database_type.database_type == "special" --threads \${GALAXY_SLOTS:-1} --special-database-type ${database_type.special_database_type} --kmer-len ${database_type.kmer_len} --minimizer-len ${database_type.minimizer_len} --minimizer-spaces ${database_type.minimizer_spaces} + ${database_type.clean} #else if $database_type.database_type == "custom" --threads \${GALAXY_SLOTS:-1} ${database_type.skip_maps} @@ -38,6 +41,7 @@ --kmer-len ${database_type.kmer_len} --minimizer-len ${database_type.minimizer_len} --minimizer-spaces ${database_type.minimizer_spaces} + ${database_type.clean} #end if ]]> @@ -54,7 +58,7 @@ - + @@ -72,7 +76,6 @@ - diff -r f005b6efd096 -r ffeb852407d6 data_manager_conf.xml --- a/data_manager_conf.xml Fri May 24 13:39:08 2019 -0400 +++ b/data_manager_conf.xml Wed Oct 23 14:21:07 2019 -0400 @@ -1,5 +1,5 @@ - +