ingest: change file name of full ppx data

Author: rneher

ingest/config/optional.yaml

@@ -24,10 +24,10 @@ upload:
       'a/sequences.fasta.xz',
       'b/metadata.tsv.gz',
       'b/sequences.fasta.xz',
-      'a/metadata_withRestricted.tsv.gz',
-      'a/sequences_withRestricted.fasta.xz',
-      'b/metadata_withRestricted.tsv.gz',
-      'b/sequences_withRestricted.fasta.xz'
+      'a/metadata_with_restricted.tsv.gz',
+      'a/sequences_with_restricted.fasta.xz',
+      'b/metadata_with_restricted.tsv.gz',
+      'b/sequences_with_restricted.fasta.xz'
     ]
     cloudfront_domain: 'data.nextstrain.org'
 

workflow/snakemake_rules/download.smk

@@ -5,8 +5,8 @@ rule download:
         metadata =  "data/{a_or_b}/metadata.tsv.gz",
         sequences = "data/{a_or_b}/sequences.fasta.xz"
     params:
-        metadata_url = "http://data.nextstrain.org/files/workflows/rsv/{a_or_b}/metadata_withRestricted.tsv.gz",
-        sequence_url = "http://data.nextstrain.org/files/workflows/rsv/{a_or_b}/sequences_withRestricted.fasta.xz"
+        metadata_url = "http://data.nextstrain.org/files/workflows/rsv/{a_or_b}/metadata_with_restricted.tsv.gz",
+        sequence_url = "http://data.nextstrain.org/files/workflows/rsv/{a_or_b}/sequences_with_restricted.fasta.xz"
     shell:
         """
         curl -fsSL --compressed {params.metadata_url:q} --output {output.metadata}