[MRG] usesourmash prefetch from sourmash v4.1.0

environment.yml

@@ -5,8 +5,5 @@ channels:
  - defaults
 dependencies:
  - mamba
- - minimap2=2.17
- - samtools=1.10
  - screed>=1.0.5,<2
- - pip:
-   - sourmash>=4,<5
+ - sourmash>=4.1,<5

genome_grist/conf/Snakefile

@@ -10,7 +10,7 @@
 # - build_consensus
 # - make_sgc_conf
 
-import glob, os, csv
+import glob, os, csv, tempfile, shutil, sys
 
 SAMPLES=config['sample']
 print(f'sample: {SAMPLES}')
@@ -19,6 +19,19 @@ outdir = config.get('outdir', 'outputs/')
 outdir = outdir.rstrip('/')
 print('outdir:', outdir)
 
+base_tempdir = None
+try_temp_locations = config.get('tempdir', [])
+for temp_loc in try_temp_locations:
+    try:
+        base_tempdir = tempfile.mkdtemp(dir=temp_loc)
+    except FileNotFoundError:
+        pass
+
+if not base_tempdir:
+    print(f"Could not create a temporary directory in any of {try_temp_locations}", file=sys.stderr)
+    print("Please set 'tempdir' in the config.", file=sys.stderr)
+    sys.exit(-1)
+
 ABUNDTRIM_MEMORY = float(config.get('metagenome_trim_memory', '1e9'))
 
 sourmash_db_pattern = config.get('sourmash_database_glob_pattern', 'MUST SPECIFY IN CONFIG')
@@ -50,6 +63,12 @@ except:
 
 ###
 
+onsuccess:
+    shutil.rmtree(base_tempdir, ignore_errors=True)
+
+onerror:
+    shutil.rmtree(base_tempdir, ignore_errors=True)
+
 wildcard_constraints:
     size="\d+",
     sample='[a-zA-Z0-9._-]+'                   # should be everything but /
@@ -192,7 +211,7 @@ rule download_sra_wc:
         r1 = protected(outdir + "/raw/{sample}_1.fastq.gz"),
         r2 = protected(outdir + "/raw/{sample}_2.fastq.gz"),
         unp = protected(outdir + "/raw/{sample}_unpaired.fastq.gz"),
-        temp_dir = temp(directory("/scratch/tmp.{sample}")),
+        temp_dir = temp(directory(f"{base_tempdir}/{{sample}}.d")),
     conda: "env/sra.yml"
     resources:
         mem_mb=40000,
@@ -573,13 +592,13 @@ rule sourmash_prefetch_gather_wc:
     conda: "env/sourmash.yml"
     params:
         ksize = SOURMASH_DB_KSIZE,
-        moltype = SOURMASH_COMPUTE_TYPE,
+        moltype = f"--{SOURMASH_COMPUTE_TYPE.lower()}",
         threshold_bp = SOURMASH_DATABASE_THRESHOLD_BP,
     shell: """
         echo "DB is {input.db}"
-        python -Werror -m genome_grist.prefetch_gather --query {input.sig} \
-          --db {input.db} --save-matches {output.matches} -k {params.ksize} \
-          --threshold-bp={params.threshold_bp} --moltype {params.moltype}
+        sourmash prefetch {input.sig} {input.db} \
+          --save-matches {output.matches} -k {params.ksize} \
+          --threshold-bp={params.threshold_bp} {params.moltype}
     """
 
 # run sourmash search x genbank and find anything matching.

genome_grist/conf/defaults.conf

@@ -5,3 +5,6 @@ sourmash_compute_ksizes:
 - 51
 sourmash_scaled: 1000
 
+# by default, leave stuff in /tmp
+tempdir:
+- /tmp

genome_grist/conf/env/sourmash.yml

@@ -5,7 +5,7 @@ channels:
 dependencies:
  - python=3.7
  - screed
+ - sourmash>=4.1,<5
  - pip
  - pip:
    - git+https://github.com/dib-lab/genome-grist.git#egg=genome-grist
-   - sourmash>=4,<5

genome_grist/conf/system.conf

@@ -1,2 +1,5 @@
 sourmash_database_glob_pattern: /home/irber/sourmash_databases/outputs/sbt/genbank-*x1e5*k31*
 sourmash_database_ksize: 31
+tempdir:
+- /scratch
+- /tmp