Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
panacota
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Amandine PERRIN
panacota
Commits
3fabec8a
Commit
3fabec8a
authored
1 year ago
by
Amandine PERRIN
Browse files
Options
Downloads
Patches
Plain Diff
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
1 year ago
Stage: test
Stage: coverage
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
PanACoTA/align_module/alignment.py
+1
-1
1 addition, 1 deletion
PanACoTA/align_module/alignment.py
test/test_unit/test_align/test_alignment.py
+5
-5
5 additions, 5 deletions
test/test_unit/test_align/test_alignment.py
with
6 additions
and
6 deletions
PanACoTA/align_module/alignment.py
+
1
−
1
View file @
3fabec8a
...
@@ -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 --a
nysymbol
{
prt_file
}
"
cmd
=
f
"
mafft --auto --a
mino
{
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
"
)
...
...
This diff is collapsed.
Click to expand it.
test/test_unit/test_align/test_alignment.py
+
5
−
5
View file @
3fabec8a
...
@@ -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 --a
nysymbol
test/data/align/exp_files/exp_aldir-pers/current.8.prt
"
in
caplog
.
text
assert
"
Mafft command: mafft --auto --a
mino
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 --a
nysymbol
test/data/align/exp_files/exp_aldir-pers/current.8.prt
'
"
assert
(
"
command
'
>mafft --auto --a
mino
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 --a
nysymbol
test/data/align/generated_by_unit-tests/aldir/
"
assert
(
"
mafft --auto --a
mino
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 --a
nysymbol
test/data/align/generated_by_unit-tests/aldir/
"
assert
(
"
mafft --auto --a
mino
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 --a
nysymbol
test/data/align/generated_by_unit-tests/aldir/
"
assert
(
"
mafft --auto --a
mino
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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment