Skip to content

Commit

Permalink
Fixed bug with missing bCalledGenes flag that was impacting a number …
Browse files Browse the repository at this point in the history
…of commands.
  • Loading branch information
donovan-h-parks committed Apr 21, 2022
1 parent 40720cc commit f4b4182
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 25 deletions.
5 changes: 4 additions & 1 deletion checkm/VERSION
@@ -1,5 +1,8 @@
1.1.10
- fixed bug with missing bCalledGenes flag that was impacting a number of commands

1.1.9
- fixed support for gzip input files
- fixed support for gzip input FASTA files

1.1.8
- updated setup.py to include long description and fixed PyPi URL
Expand Down
49 changes: 25 additions & 24 deletions checkm/main.py
Expand Up @@ -468,11 +468,12 @@ def gcPlot(self, options):
self.logger.info(
'[CheckM - gc_plot] Creating GC histogram and delta-GC plot.')

checkBinInputExists(options.bin_input, options.bCalledGenes)
checkBinInputExists(options.bin_input, False)
makeSurePathExists(options.output_dir)

binFiles = self.binFiles(
options.bin_input, options.extension, options.bCalledGenes)
options.bin_input,
options.extension, False)

plots = GcPlots(options)
filesProcessed = 1
Expand All @@ -496,11 +497,11 @@ def codingDensityPlot(self, options):
self.logger.info(
'[CheckM - coding_plot] Creating coding density histogram and delta-CD plot.')

checkBinInputExists(options.bin_input, options.bCalledGenes)
checkBinInputExists(options.bin_input, False)
makeSurePathExists(options.output_dir)

binFiles = self.binFiles(
options.bin_input, options.extension, options.bCalledGenes)
options.bin_input, options.extension, False)

plots = CodingDensityPlots(options)
filesProcessed = 1
Expand All @@ -524,11 +525,11 @@ def tetraDistPlot(self, options):
self.logger.info(
'[CheckM - tetra_plot] Creating tetra-distance histogram and delta-TD plot.')

checkBinInputExists(options.bin_input, options.bCalledGenes)
checkBinInputExists(options.bin_input, False)
makeSurePathExists(options.output_dir)

binFiles = self.binFiles(
options.bin_input, options.extension, options.bCalledGenes)
options.bin_input, options.extension, False)

genomicSignatures = GenomicSignatures(K=4, threads=1)
tetraSigs = genomicSignatures.read(options.tetra_profile)
Expand All @@ -555,11 +556,11 @@ def distributionPlots(self, options):
self.logger.info(
'[CheckM - dist_plot] Creating GC, CD, and TD distribution plots.')

checkBinInputExists(options.bin_input, options.bCalledGenes)
checkBinInputExists(options.bin_input, False)
makeSurePathExists(options.output_dir)

binFiles = self.binFiles(
options.bin_input, options.extension, options.bCalledGenes)
options.bin_input, options.extension, False)

genomicSignatures = GenomicSignatures(K=4, threads=1)
tetraSigs = genomicSignatures.read(options.tetra_profile)
Expand Down Expand Up @@ -587,11 +588,11 @@ def gcBiasPlot(self, options):
self.logger.info(
'[CheckM - gc_bias_plot] Plotting bin coverage as a function of GC.')

checkBinInputExists(options.bin_input, options.bCalledGenes)
checkBinInputExists(options.bin_input, False)
makeSurePathExists(options.output_dir)

binFiles = self.binFiles(
options.bin_input, options.extension, options.bCalledGenes)
options.bin_input, options.extension, False)

coverageWindows = CoverageWindows(options.threads)
coverageProfile = coverageWindows.run(
Expand Down Expand Up @@ -619,11 +620,11 @@ def nxPlot(self, options):

self.logger.info('[CheckM - nx_plot] Creating Nx-plots.')

checkBinInputExists(options.bin_input, options.bCalledGenes)
checkBinInputExists(options.bin_input, False)
makeSurePathExists(options.output_dir)

binFiles = self.binFiles(
options.bin_input, options.extension, options.bCalledGenes)
options.bin_input, options.extension, False)

nx = NxPlot(options)
filesProcessed = 1
Expand All @@ -647,11 +648,11 @@ def lengthHistogram(self, options):
self.logger.info(
'[CheckM - len_hist] Creating sequence length histogram.')

checkBinInputExists(options.bin_input, options.bCalledGenes)
checkBinInputExists(options.bin_input, False)
makeSurePathExists(options.output_dir)

binFiles = self.binFiles(
options.bin_input, options.extension, options.bCalledGenes)
options.bin_input, options.extension, False)

plot = LengthHistogram(options)
filesProcessed = 1
Expand All @@ -675,12 +676,12 @@ def markerPlot(self, options):
self.logger.info(
'[CheckM - marker_plot] Creating marker gene position plot.')

checkBinInputExists(options.bin_input, options.bCalledGenes)
checkBinInputExists(options.bin_input, False)
makeSurePathExists(options.output_dir)

# generate plot for each bin
binFiles = self.binFiles(
options.bin_input, options.extension, options.bCalledGenes)
options.bin_input, options.extension, False)

resultsParser = ResultsParser(None)
markerGeneStats = resultsParser.parseMarkerGeneStats(
Expand Down Expand Up @@ -715,10 +716,10 @@ def unbinned(self, options):

self.logger.info('[CheckM - unbinned] Identify unbinned sequences.')

checkBinInputExists(options.bin_input, options.bCalledGenes)
checkBinInputExists(options.bin_input, False)

binFiles = self.binFiles(
options.bin_input, options.extension, options.bCalledGenes)
options.bin_input, options.extension, False)

unbinned = Unbinned()
unbinned.run(binFiles, options.seq_file, options.output_seq_file,
Expand All @@ -737,11 +738,11 @@ def coverage(self, options):
self.logger.info(
'[CheckM - coverage] Calculating coverage of sequences.')

checkBinInputExists(options.bin_input, options.bCalledGenes)
checkBinInputExists(options.bin_input, False)
makeSurePathExists(os.path.dirname(options.output_file))

binFiles = self.binFiles(
options.bin_input, options.extension, options.bCalledGenes)
options.bin_input, options.extension, False)

coverage = Coverage(options.threads)
coverage.run(binFiles, options.bam_files, options.output_file, options.all_reads,
Expand Down Expand Up @@ -850,12 +851,12 @@ def outliers(self, options):

self.logger.info('[CheckM - outlier] Identifying outliers in bins.')

checkBinInputExists(options.bin_input, options.bCalledGenes)
checkBinInputExists(options.bin_input, False)
checkFileExists(options.tetra_profile)
makeSurePathExists(os.path.dirname(options.output_file))

binFiles = self.binFiles(
options.bin_input, options.extension, options.bCalledGenes)
options.bin_input, options.extension, False)

binTools = BinTools()
binTools.identifyOutliers(options.results_dir,
Expand Down Expand Up @@ -906,7 +907,7 @@ def unique(self, options):
'[CheckM - unique] Ensuring no sequences are assigned to multiple bins.')

binFiles = self.binFiles(
options.bin_input, options.extension, options.bCalledGenes)
options.bin_input, options.extension, False)

binTools = BinTools()
binTools.unique(binFiles)
Expand All @@ -920,7 +921,7 @@ def ssuFinder(self, options):
'[CheckM - ssu_finder] Identifying SSU (16S/18S) rRNAs in sequences.')

binFiles = self.binFiles(
options.bin_input, options.extension, options.bCalledGenes)
options.bin_input, options.extension, False)

checkFileExists(options.seq_file)
makeSurePathExists(options.output_dir)
Expand Down

0 comments on commit f4b4182

Please sign in to comment.