Merge remote-tracking branch 'origin/master' into test

ncbi · Sep 28, 2023 · 2d85168 · 2d85168
2 parents 3472e65 + 96dbb41
commit 2d85168
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pgap.cwl b/pgap.cwl
@@ -184,6 +184,7 @@ steps:
       no_internet: no_internet
       make_uuid: make_uuid
       uuid_in: uuid_in
+      blast_hits_cache_data: blast_hits_cache_data
     out: [gbent, gbk, gff, nucleotide_fasta, protein_fasta, cds_nucleotide_fasta, cds_protein_fasta, sqn, initial_asndisc_error_diag, initial_asnval_error_diag, final_asndisc_error_diag, final_asnval_error_diag, checkm_raw, checkm_results]
     run: wf_common.cwl
   Generate_Annotation_Reports_gff_enhanced:

diff --git a/scripts/pgap.py b/scripts/pgap.py
@@ -258,8 +258,8 @@ def make_podman_cmd(self):
             log_dir = self.params.outputdir + '/debug/log'
             os.makedirs(log_dir, exist_ok=True)
             self.cmd.extend(['--volume', '{}:/log/srv'.format(log_dir)])
-            if self.params.args.container_name:
-                self.cmd.extend(['--name', self.params.args.container_name])
+        if self.params.args.container_name:
+            self.cmd.extend(['--name', self.params.args.container_name])
         self.cmd.append(self.params.docker_image)
 
     def make_singularity_cmd(self):