Skip to content

Commit a9c16e9

Browse files
committed
print underlying command line always, not forcing floatoption of cli to be float, issue with mafft threads integer
1 parent 430fbcc commit a9c16e9

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

read2tree/Aligner.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,9 +292,11 @@ def _align_worker(self, og_set):
292292
mafft_wrapper = Mafft(value.aa, datatype=DataType.PROTEIN)
293293
mafft_wrapper.options.options['--localpair'].set_value(True)
294294
mafft_wrapper.options.options['--maxiterate'].set_value(1000)
295-
mafft_wrapper.options.options['--thread'].set_value(self.args.threads)
295+
mafft_wrapper.options.options['--thread'].set_value(int(self.args.threads))
296296
logger.info("aligning OG {} with {} proteins".format(key, len(value.aa)))
297297
alignment = mafft_wrapper()
298+
#logger.debug("MAFFT command line : {} {}".format(mafft_wrapper.cli.exe ,mafft_wrapper.command()))
299+
298300
codons = self._get_codon_dict_og(value)
299301
align = Alignment()
300302
align.aa = alignment

read2tree/wrappers/abstract_cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ def __call__(self, cmd=None, wait=False, **flags):
212212
if flags:
213213
cmd = ' '.join([cmd.strip(), _kwargs_to_args(flags, self._hyphen_policy)])
214214
self.cmd = '{} {}'.format(self.exe, cmd)
215-
logger.debug('Running following command: {}'.format(self.cmd))
215+
logger.info('Running following command: {}'.format(self.cmd))
216216

217217
# spawn
218218
self.process = Popen(shlex.split(self.cmd),

read2tree/wrappers/options.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def _type(self):
9999
return Real
100100

101101
def get_value(self):
102-
return float(self._value)
102+
return self._value
103103

104104

105105
class StringOption(TypedValueOption):

0 commit comments

Comments
 (0)