Skip to content
Snippets Groups Projects
Commit 3fabec8a authored by Amandine  PERRIN's avatar Amandine PERRIN
Browse files

Change --anysymbol to --amino for prot alignment

parent ff9c8a05
No related branches found
No related tags found
No related merge requests found
Pipeline #110280 failed
...@@ -557,7 +557,7 @@ def mafft_align(num_fam, prt_file, mafft_file, nbfprt, logger): ...@@ -557,7 +557,7 @@ def mafft_align(num_fam, prt_file, mafft_file, nbfprt, logger):
False otherwise False otherwise
""" """
logger.log(utils.detail_lvl(), f"Aligning family {num_fam}") logger.log(utils.detail_lvl(), f"Aligning family {num_fam}")
cmd = f"mafft --auto --anysymbol {prt_file}" cmd = f"mafft --auto --amino {prt_file}"
error = f"Problem while trying to align fam {num_fam}" error = f"Problem while trying to align fam {num_fam}"
stdout = open(mafft_file, "w") stdout = open(mafft_file, "w")
stderr = open(mafft_file + ".log", "w") stderr = open(mafft_file + ".log", "w")
......
...@@ -470,7 +470,7 @@ def test_family_align_mafftempty_btrempty(caplog): ...@@ -470,7 +470,7 @@ def test_family_align_mafftempty_btrempty(caplog):
"in test/data/align/exp_files/exp_aldir-pers/current.8.prt (3) and proteins aligned " "in test/data/align/exp_files/exp_aldir-pers/current.8.prt (3) and proteins aligned "
"in existing test/data/align/generated_by_unit-tests/test_fam_align.8.aln") in caplog.text "in existing test/data/align/generated_by_unit-tests/test_fam_align.8.aln") in caplog.text
assert "Aligning family 8" in caplog.text assert "Aligning family 8" in caplog.text
assert "Mafft command: mafft --auto --anysymbol test/data/align/exp_files/exp_aldir-pers/current.8.prt" in caplog.text assert "Mafft command: mafft --auto --amino test/data/align/exp_files/exp_aldir-pers/current.8.prt" in caplog.text
assert "Back-translating family 8" in caplog.text assert "Back-translating family 8" in caplog.text
# Check content of mafft and btr files # Check content of mafft and btr files
exp_mafft = os.path.join(EXPPATH, "exp_aldir-pers", "mafft-align.8.aln") exp_mafft = os.path.join(EXPPATH, "exp_aldir-pers", "mafft-align.8.aln")
...@@ -577,7 +577,7 @@ def test_family_align_nomafft_btrempty_errormafft(caplog): ...@@ -577,7 +577,7 @@ def test_family_align_nomafft_btrempty_errormafft(caplog):
ngenomes, logger) ngenomes, logger)
assert "Checking extractions for family 8" in caplog.text assert "Checking extractions for family 8" in caplog.text
assert "Aligning family 8" in caplog.text assert "Aligning family 8" in caplog.text
assert ("command '>mafft --auto --anysymbol test/data/align/exp_files/exp_aldir-pers/current.8.prt' " assert ("command '>mafft --auto --amino test/data/align/exp_files/exp_aldir-pers/current.8.prt' "
"is not possible") in caplog.text "is not possible") in caplog.text
# Check content of mafft and btr files # Check content of mafft and btr files
assert not os.path.isfile(mafft_file) assert not os.path.isfile(mafft_file)
...@@ -808,7 +808,7 @@ def test_handle_family_true(): ...@@ -808,7 +808,7 @@ def test_handle_family_true():
q.put(None) q.put(None)
assert "Checking extractions for family 8" in q.get().message assert "Checking extractions for family 8" in q.get().message
assert "Aligning family 8" in q.get().message assert "Aligning family 8" in q.get().message
assert ("mafft --auto --anysymbol test/data/align/generated_by_unit-tests/aldir/" assert ("mafft --auto --amino test/data/align/generated_by_unit-tests/aldir/"
"TESThandlefam-current.8.prt") in q.get().message "TESThandlefam-current.8.prt") in q.get().message
assert "Back-translating family 8" in q.get().message assert "Back-translating family 8" in q.get().message
# Writes it twice: 1 for nucleic and one for aa # Writes it twice: 1 for nucleic and one for aa
...@@ -849,7 +849,7 @@ def test_handle_family_true_nomiss(): ...@@ -849,7 +849,7 @@ def test_handle_family_true_nomiss():
q.put(None) q.put(None)
assert "Checking extractions for family 8" in q.get().message assert "Checking extractions for family 8" in q.get().message
assert "Aligning family 8" in q.get().message assert "Aligning family 8" in q.get().message
assert ("mafft --auto --anysymbol test/data/align/generated_by_unit-tests/aldir/" assert ("mafft --auto --amino test/data/align/generated_by_unit-tests/aldir/"
"TESThandlefam-current.8.prt") in q.get().message "TESThandlefam-current.8.prt") in q.get().message
assert "Back-translating family 8" in q.get().message assert "Back-translating family 8" in q.get().message
assert not q.get() assert not q.get()
...@@ -894,7 +894,7 @@ def test_handle_family_emptyaln_true(): ...@@ -894,7 +894,7 @@ def test_handle_family_emptyaln_true():
"and proteins aligned in existing " "and proteins aligned in existing "
"test/data/align/generated_by_unit-tests/aldir/TESThandlefam-mafft-align.8.aln") in q.get().message "test/data/align/generated_by_unit-tests/aldir/TESThandlefam-mafft-align.8.aln") in q.get().message
assert "Aligning family 8" in q.get().message assert "Aligning family 8" in q.get().message
assert ("mafft --auto --anysymbol test/data/align/generated_by_unit-tests/aldir/" assert ("mafft --auto --amino test/data/align/generated_by_unit-tests/aldir/"
"TESThandlefam-current.8.prt") in q.get().message "TESThandlefam-current.8.prt") in q.get().message
assert "Back-translating family 8" in q.get().message assert "Back-translating family 8" in q.get().message
assert "Adding missing genomes for family 8 in protein alignment" in q.get().message assert "Adding missing genomes for family 8 in protein alignment" in q.get().message
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment