Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
7f5564b
added an if statement to see if type isolate was user-defined
anleip Nov 17, 2025
ad6bb43
changed - to _ in type_isolate
anleip Nov 17, 2025
b5841c8
removed first condition in if statement since it is never true
anleip Nov 18, 2025
1cb5b0d
removed type isolate input from prune_edges()
anleip Nov 20, 2025
6750d2f
removed type isolate generation and usage from qcDistMat()
anleip Nov 20, 2025
d2e8d18
updated description for prune_edges()
anleip Nov 20, 2025
017ab98
Removed type isolate arguement and error
anleip Nov 20, 2025
805452a
added the newDistMat variable and changed the input for plot from dis…
anleip Nov 20, 2025
be055df
make the update of newDistMat to global variable in prune_distance_ma…
anleip Nov 20, 2025
3e1778b
Deleted global statement before newDistMat since it is not needed
anleip Nov 21, 2025
c0ec62a
added comment where newDistMat gets updated
anleip Nov 21, 2025
d499017
get newDistMat from remove_qc_fail
anleip Nov 21, 2025
83c99c6
added a return for newDistMat in remove_qc_fail()
anleip Nov 21, 2025
c83a2bd
a maybe cleaner way to get newDistMat from prune_distance_mtrix()
anleip Nov 21, 2025
01b8f4b
added comments on newDistMat for remove_qc_fail()
anleip Nov 21, 2025
10fa84b
make distance files despite empty failed list prune_distance_matrix()
anleip Nov 21, 2025
e1d9815
allow h5 file to be written with empty failed list remove_qc_fail()
anleip Nov 21, 2025
800c46f
allow writing output files with no sample to remove
anleip Nov 21, 2025
262a693
updated QC test scripts
anleip Nov 25, 2025
9431036
updated qc test script again
anleip Nov 25, 2025
fe55e14
removed type isolate argument from extractReferences()
anleip Nov 25, 2025
b787cf3
removed type isolate argument in clique pruning
anleip Nov 25, 2025
0ba9481
Removed the last type isolate argument
anleip Nov 25, 2025
34a74d3
Removed type isolate arguements
anleip Nov 25, 2025
81eff19
Removed type isolate argument
anleip Nov 25, 2025
33e48be
Added a comment
anleip Nov 25, 2025
df8a832
Uncommented a qc test
anleip Nov 28, 2025
2b05b3f
output whole tuple
anleip Nov 28, 2025
2d4a500
removed the use of newDistMat, instead update distMat
anleip Nov 28, 2025
19191a5
removed type isolate function
anleip Nov 28, 2025
2602f22
updated version number to 2.7.7
anleip Nov 28, 2025
6649056
Removed reference to type isolate
anleip Nov 28, 2025
2fd57f5
removed software-properties-common
anleip Nov 28, 2025
72ad364
Try graph tools apt package
johnlees Nov 28, 2025
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
6 changes: 1 addition & 5 deletions PopPUNK/assign.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@ def get_options():
default = default_max_merge, type = int)
qcGroup.add_argument('--betweenness', default=False, action='store_true',
help='Report the betweenness of all the query nodes [default = False]')
qcGroup.add_argument('--type-isolate', help='Isolate from which distances can be calculated for pruning [default = None]',
default = None, type = str)
qcGroup.add_argument('--length-sigma', help='Number of standard deviations of length distribution beyond '
'which sequences will be excluded [default = 5]', default = None, type = int)
qcGroup.add_argument('--length-range', help='Allowed length range, outside of which sequences will be excluded '
Expand Down Expand Up @@ -188,10 +186,9 @@ def main():
'prop_zero': args.max_zero_dist,
'max_merge': args.max_merge,
'betweenness': args.betweenness,
'type_isolate': args.type_isolate
}
else:
qc_dict = {'run_qc': False, 'type_isolate': None }
qc_dict = {'run_qc': False}

# Dict of DB access functions for assign_query (which is out of scope)
dbFuncs = setupDBFuncs(args)
Expand Down Expand Up @@ -785,7 +782,6 @@ def assign_query_hdf5(dbFuncs,
merged_queries,
outSuffix = file_extension_string,
existingRefs = existing_ref_list,
type_isolate = qc_dict['type_isolate'],
threads = threads,
use_gpu = gpu_graph,
fast_mode = update_db == "fast")
Expand Down
2 changes: 1 addition & 1 deletion PopPUNK/lineages.py
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ def query_db(args):
external_clustering = clustering_file

# Ignore QC at the moment
qc_dict = {'run_qc': False, 'type_isolate': None }
qc_dict = {'run_qc': False}

# Check output file
if args.output is None:
Expand Down
3 changes: 2 additions & 1 deletion PopPUNK/qc.py
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,8 @@ def get_failure_reasons(sample, fail_dicts):
if sample in fail_dict
for reason in fail_dict[sample]
]


# Type isolate is no longer supported in PopPUNK
def pickTypeIsolate(prefix, refList):
"""Selects a type isolate as that with a minimal proportion
of missing data.
Expand Down
Loading