diff --git a/metaphlan/utils/external_exec.py b/metaphlan/utils/external_exec.py index 17212cb..2db1ee6 100755 --- a/metaphlan/utils/external_exec.py +++ b/metaphlan/utils/external_exec.py @@ -57,7 +57,7 @@ def generate_phylophlan_config_file(output_dir, configuration): conf_file = os.path.join(output_dir, "phylophlan.cfg") params = { "program_name": "phylophlan_write_config_file", - "params": "-d n --db_dna makeblastdb --map_dna {} --msa {} --trim {} --tree1 {}".format(configuration['map'], configuration['aligner'], configuration['trim'], configuration['tree1']), + "params": "-d n --db_dna makeblastdb --map_dna {} --msa {} --tree1 {}".format(configuration['map'], configuration['aligner'], configuration['tree1']), "output": "-o", "command_line": "#program_name# #output# #params#" } @@ -265,11 +265,9 @@ def run_command(cmd, shell=False, **kwargs): stdout = stdout.decode() if isinstance(stderr, bytes): stderr = stderr.decode() - error('Execution failed for command', cmd) - print('stdout: ') - print(stdout) - print('stderr: ') - print(stderr) + error(f'Execution failed for command {cmd}', exit=False) + error(f'stdout:\n{stdout}', exit=False) + error(f'stderr:\n{stderr}', exit=False) error('Exiting', exit=True) return r diff --git a/metaphlan/utils/phylophlan_controller.py b/metaphlan/utils/phylophlan_controller.py index 3744d0b..a97c962 100644 --- a/metaphlan/utils/phylophlan_controller.py +++ b/metaphlan/utils/phylophlan_controller.py @@ -34,7 +34,6 @@ def get_phylophlan_configuration(): configuration = { 'map': 'blastn', 'aligner': 'mafft', - 'trim': 'trimal', 'tree1': 'raxml' } return configuration