Skip to content

Commit

Permalink
Merge pull request nf-core#10 from tiagochst/bioconda
Browse files Browse the repository at this point in the history
Bioconda
  • Loading branch information
ewels committed May 30, 2018
2 parents 7279bdb + 314ba21 commit 9977832
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM nfcore/base
MAINTAINER Phil Ewels <phil.ewels@scilifelab.se>
LABEL authors="phil.ewels@scilifelab.se" \
description="Docker image containing all requirements for the nfcore/ChIPseq pipeline"
description="Docker image containing all requirements for the nfcore/ChIPseq pipeline"

COPY environment.yml /
RUN conda env create -f /environment.yml && conda clean -a
ENV PATH /opt/conda/envs/nfcore-chipseq-1.4dev/bin:$PATH
ENV PATH /opt/conda/envs/nfcore-chipseq-1.4dev/bin:$PATH
5 changes: 4 additions & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ dependencies:
- fastqc=0.11.7
- trim-galore=0.4.5
- bwa=0.7.17
- conda-forge::gawk=4.2.1
- conda-forge::r-markdown=0.8
- bioconda::r-spp=1.15.2
- bedtools=2.27.1
Expand All @@ -28,6 +29,7 @@ dependencies:
- conda-forge::r-ggplot2=2.2.1
- conda-forge::r-knitr=1.20
- conda-forge::r-rmysql=0.10.13
- conda-forge::r-doparallel=1.0.11
- bioconda::bioconductor-bsgenome=1.46.0
- bioconda::bioconductor-rsamtools=1.30.0
- bioconda::bioconductor-shortread=1.36.0
Expand All @@ -41,4 +43,5 @@ dependencies:
- bioconda::bioconductor-org.hs.eg.db=3.5.0
- bioconda::bioconductor-bsgenome.mmusculus.ucsc.mm10=1.4.0
- bioconda::bioconductor-org.mm.eg.db=3.5.0
- bioconda::r-spp=1.15.2
- deeptools=3.0.2
- bioconda::r-spp=1.15.2
4 changes: 2 additions & 2 deletions main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ process deepTools {
bamCoverage \\
-b $bam \\
--extendReads ${params.extendReadsLen} \\
--normalizeUsingRPKM \\
--normalizeUsing RPKM \\
-o ${bam}.bw
"""
} else {
Expand All @@ -619,7 +619,7 @@ process deepTools {
bamCoverage \\
-b \$bamfile \\
--extendReads ${params.extendReadsLen} \\
--normalizeUsingRPKM \\
--normalizeUsing RPKM \\
-o \${bamfile}.bw
done
Expand Down

0 comments on commit 9977832

Please sign in to comment.