Skip to content

Commit 383ff28

Browse files
committed
Updated several package versions to be compatible with python 3.8.6. Now iCount installs in conda via pip.
1 parent 012c96d commit 383ff28

File tree

2 files changed

+32
-25
lines changed

2 files changed

+32
-25
lines changed

Dockerfile

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ ENV TZ=Europe/Ljubljana
88
# thanks to https://github.com/bschiffthaler/ngs/blob/master/base/Dockerfile
99
# and https://github.com/AveraSD/ngs-docker-star/blob/master/Dockerfile
1010

11-
SHELL ["/bin/bash", "-c"]
11+
SHELL ["/bin/bash", "--login", "-c"]
12+
13+
RUN apt-get install -y vim
1214

1315
RUN conda update -n base -c defaults conda -y
1416
RUN conda install -c conda-forge mamba -y
@@ -36,14 +38,20 @@ RUN chown -R icuser.icuser /home/icuser
3638
USER icuser
3739
WORKDIR /home/icuser
3840
RUN mkdir /home/icuser/storage
39-
RUN git clone https://github.com/tomazc/iCount.git --branch snakemake
41+
#RUN git clone https://github.com/tomazc/iCount.git --branch snakemake
42+
COPY . /home/icuser/iCount
4043

4144
RUN conda create -c conda-forge -c bioconda -n iCount_pipeline3 -y
4245
RUN conda init bash
4346
RUN echo "conda activate iCount_pipeline3" >> ~/.bashrc
44-
#RUN conda env update --file iCount/conda_iCount.yaml # needs ~ 4 GB RAM, otherwise killed
45-
#RUN pip install ./iCount
4647

47-
#ENV PATH /home/icuser/bin:$PATH
48-
#WORKDIR /home/icuser
49-
#CMD ["/bin/bash"]
48+
SHELL ["conda", "run", "-n", "iCount_pipeline3", "/bin/bash", "-c"]
49+
50+
### needs ~ 4 GB RAM, otherwise killed
51+
RUN conda env update --file iCount/conda_iCount.yaml
52+
53+
RUN pip install ./iCount
54+
55+
ENV PATH /home/icuser/bin:$PATH
56+
WORKDIR /home/icuser
57+
CMD ["/bin/bash"]

conda_iCount.yaml

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,23 @@ channels:
55

66
dependencies:
77
- python = 3.8.6
8-
- snakemake = 5.5.4
9-
- jinja2 = 2.10.1
10-
- networkx = 2.3
11-
- bcftools = 1.9
12-
- samtools = 1.10
8+
- snakemake = 5.28.0
9+
- jinja2 = 2.11.2
10+
- networkx = 2.5
11+
- bcftools = 1.11
12+
- samtools = 1.11
1313
- bwa = 0.7.17
14-
- pysam = 0.16.0
15-
- cutadapt = 2.4
16-
- bedtools = 2.28
17-
- STAR = 2.7.2a
18-
- trim-galore = 0.6.4
14+
- pysam = 0.16.0.1
15+
- cutadapt = 3.0
16+
- bedtools = 2.29.2
17+
- STAR = 2.7.6a
18+
- trim-galore = 0.6.6
1919
- pip = 20.2.4
20-
- pybedtools = 0.8.0
21-
- numpy = 1.17.1
22-
- pandas = 0.25.1
23-
- pybedtools = 0.8.0
24-
- numpydoc = 0.9.1
25-
- sphinx = 2.2.0
26-
- matplotlib = 3.1.0
27-
- docutils = 0.15.2
20+
- pybedtools = 0.8.1
21+
- numpy = 1.19.4
22+
- pandas = 1.1.4
23+
- numpydoc = 1.1.0
24+
- sphinx = 3.3.1
25+
- matplotlib = 3.3.3
26+
- docutils = 0.16
2827
- sphinx-releases = 1.6.1

0 commit comments

Comments
 (0)