Skip to content

Commit 1a0d33d

Browse files
committed
separate env for fq lint
1 parent f635db7 commit 1a0d33d

File tree

6 files changed

+14
-7
lines changed

6 files changed

+14
-7
lines changed

.github/workflows/linux.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ jobs:
100100
'CONDA_PREPROCESSING_ENV',
101101
'CONDA_NONCODING_RNASEQ_ENV',
102102
'CONDA_SAMBAMBA_ENV',
103-
'CONDA_pysam_ENV'
103+
'CONDA_pysam_ENV',
104+
'CONDA_FQLINT_ENV'
104105
]
105106
runs-on: ubuntu-latest
106107
steps:

.github/workflows/osx.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ jobs:
3131
'CONDA_PREPROCESSING_ENV',
3232
'CONDA_NONCODING_RNASEQ_ENV',
3333
'CONDA_SAMBAMBA_ENV',
34-
'CONDA_pysam_ENV'
34+
'CONDA_pysam_ENV',
35+
'CONDA_FQLINT_ENV'
3536
]
3637
runs-on: macos-latest
3738
steps:

snakePipes/common_functions.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ def set_env_yamls():
4242
'CONDA_NONCODING_RNASEQ_ENV': 'envs/noncoding.yaml',
4343
'CONDA_SAMBAMBA_ENV': 'envs/sambamba.yaml',
4444
'CONDA_pysam_ENV': 'envs/pysam.yaml',
45-
'CONDA_SEACR_ENV': 'envs/chip_seacr.yaml'}
45+
'CONDA_SEACR_ENV': 'envs/chip_seacr.yaml',
46+
'CONDA_FQLINT_ENV': 'envs/fqlint.yaml'
47+
}
4648

4749

4850
def merge_dicts(x, y):

snakePipes/shared/rules/FASTQ.snakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ if pairedEnd or pipeline=="scrnaseq":
55
r2 = indir+"/{sample}"+reads[1]+ext
66
output:
77
temp("originalFASTQ/{sample}.valid")
8-
conda: CONDA_SHARED_ENV
8+
conda: CONDA_FQLINT_ENV
99
shell:"""
1010
fq lint {input.r1} {input.r2}
1111
touch {output}
@@ -16,7 +16,7 @@ else:
1616
r1 = indir+"/{sample}"+reads[0]+ext
1717
output:
1818
temp("originalFASTQ/{sample}.valid")
19-
conda: CONDA_SHARED_ENV
19+
conda: CONDA_FQLINT_ENV
2020
shell:"""
2121
fq lint {input.r1}
2222
touch {output}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
channels:
2+
- bioconda
3+
dependencies:
4+
- fq = 0.12.0

snakePipes/shared/rules/envs/shared.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: snakepipes_shared_environment_2.0
22
channels:
3-
- bioconda
43
- conda-forge
4+
- bioconda
55
dependencies:
66
- python = 3.10.13
77
- deeptools = 3.5.4
@@ -15,6 +15,5 @@ dependencies:
1515
- multiqc = 1.23
1616
- fastp = 0.23.4
1717
- umi_tools = 1.1.4
18-
- fq = 0.12.0
1918
- pybigwig = 0.3.22
2019

0 commit comments

Comments
 (0)