Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions abutils/tests/test_phylo.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,13 @@ def test_phylogeny_with_list_input(sequences):
assert len(phylo.sequences) == 3


def test_phylogeny_tree_loads_newick(sequences):
phylo = phylogeny(sequences)
phylo.tree_string = "(seq1:0.1,seq2:0.2,seq3:0.3);"
leaves = [o for o in phylo.tree.Objects if o.branchType == "leaf"]
assert sorted(leaf.name for leaf in leaves) == ["seq1", "seq2", "seq3"]


def test_phylogeny_with_name(fasta_file):
name = "test_phylogeny_with_name"
phylo = phylogeny(fasta_file.name, name=name)
Expand Down
4 changes: 2 additions & 2 deletions abutils/tools/preprocessing.py
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,7 @@ def _deduplicate_sequences(
return (
df.group_by(group_by_cols)
.agg(
pl.count().alias("count"),
pl.len().alias("count"),
pl.col("sequence_id").first(),
)
.sort("sequence")
Expand Down Expand Up @@ -1030,7 +1030,7 @@ def deduplicate(
pool_unique = (
pool_df.group_by("sequence")
.agg(
pl.count().alias("count"),
pl.len().alias("count"),
pl.col("sequence_id").first(),
)
.sort("sequence")
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
abstar>=0.7
baltic
# baltic 1.0 renamed its API (loadNewick -> load_newick, leaf/node/tree are modules)
baltic<1
biopython>=1.78
# celery
dnachisel
Expand Down
Loading