Skip to content

Commit 2cefbe0

Browse files
Fix Salmon index for Refseq build
1 parent 10841f1 commit 2cefbe0

4 files changed

Lines changed: 10 additions & 4 deletions

File tree

src/python/tidy_samples_by_metadata.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,9 @@ def tidy_samples(
127127
# df = df.dropna(subset = "sample_name")
128128
samples.fillna("NA", inplace=True)
129129

130+
# Remove the '.0' suffix from the 'run' column
131+
samples['run'] = samples['run'].astype(str).str.replace('.0', '', regex=False)
132+
130133
# Iterate over by_merge_metadata to create the merged columns if not None
131134
if by_merge_metadata is not None:
132135
for merge_metadata in by_merge_metadata:

src/snakemake/rules/danpos_wiq.smk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ rule danpos_wiq:
3131
conda:
3232
"../envs/danpos.yaml"
3333
wildcard_constraints:
34-
wig_to_wiq = "[a-zA-Z0-9_-]+",
35-
reference = "[a-zA-Z0-9_-]+"
34+
wig_to_wiq = "[a-zA-Z0-9_+-]+",
35+
reference = "[a-zA-Z0-9_+-]+"
3636
threads:
3737
1
3838
priority:

src/snakemake/rules/salmon_index.smk

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,18 @@ rule salmon_index_refseq_with_decoys:
2424
rna = expand(
2525
"out/wget/https/ftp.ncbi.nlm.nih.gov/refseq/H_sapiens/mRNA_Prot/human.{number}.rna.fna.gz",
2626
number=range(1, 17) # Specify the range of numbers from 1 to 16
27-
)
27+
),
2828
dna = "out/wget/ftp/ftp.ensembl.org/pub/release-102/fasta/homo_sapiens/dna/Homo_sapiens.GRCh38.dna.primary_assembly.fa.gz"
2929
output:
3030
directory("out/salmon/index_refseq_with_decoys/homo_sapiens")
31+
conda:
32+
"../envs/salmon.yaml"
3133
shell:
3234
"""
3335
mkdir -p {output}
3436
cat {input} > {output}/transcriptome_genome.fa.gz
3537
36-
zcat {input.dna} | grep "^>" | cut -d " " -f 1 | sed "s/>//g" > {output}/decoys.txt
38+
zgrep "^>" {input.dna} | cut -d " " -f 1 | sed "s/>//g" > {output}/decoys.txt
3739
3840
salmon index -t {output}/transcriptome_genome.fa.gz -d {output}/decoys.txt -i {output}
3941

src/snakemake/tables/salmon_index_ids.tsv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
id path
22
salmon-index-GRCh38-ensembl-r103-cdna "out/salmon/index/wget/http/ftp.ensembl.org/pub/release-103/fasta/homo_sapiens/cdna/Homo_sapiens.GRCh38.cdna.all"
3+
salmon-index-GRCh38-RefSeq "out/salmon/index_refseq_with_decoys/homo_sapiens"
34
salmon-index-GRCh38-ensembl-r103 "out/salmon/index_ensembl_with_decoys/release-103/fasta/homo_sapiens/Homo_sapiens.GRCh38"
45
salmon-index-GRCh38-ensembl-r102 "out/salmon/index_ensembl_with_decoys/release-102/fasta/homo_sapiens/Homo_sapiens.GRCh38"
56
salmon-index-GRCm38-ensembl-r102 "out/salmon/index_ensembl_with_decoys/release-102/fasta/mus_musculus/Mus_musculus.GRCm38"

0 commit comments

Comments
 (0)