Skip to content

Commit f1ce2c0

Browse files
committed
perf: optimize isolate mapping with bam format and improved tooling
- Switch from SAM to BAM format for compressed file handling - Update virtool/tools container from 1.0.0 to 1.1.0 - Add samtools 1.22.1 for efficient BAM processing - Enhance isolate mapping performance through binary format usage
1 parent 8c273c4 commit f1ce2c0

File tree

7 files changed

+79
-2101
lines changed

7 files changed

+79
-2101
lines changed

Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
FROM python:3.12.3-bookworm AS deps
22
WORKDIR /app
3-
COPY --from=ghcr.io/virtool/tools:1.0.0 /tools/bowtie2/2.5.4/bowtie* /usr/local/bin/
4-
COPY --from=ghcr.io/virtool/tools:1.0.0 /tools/hmmer/3.2.1 /opt/hmmer
5-
COPY --from=ghcr.io/virtool/tools:1.0.0 /tools/fastqc/0.11.9 /opt/fastqc
6-
COPY --from=ghcr.io/virtool/tools:1.0.0 /tools/pigz/2.8/pigz /usr/local/bin/
3+
COPY --from=ghcr.io/virtool/tools:1.1.0 /tools/bowtie2/2.5.4/bowtie* /usr/local/bin/
4+
COPY --from=ghcr.io/virtool/tools:1.1.0 /tools/hmmer/3.2.1 /opt/hmmer
5+
COPY --from=ghcr.io/virtool/tools:1.1.0 /tools/fastqc/0.11.9 /opt/fastqc
6+
COPY --from=ghcr.io/virtool/tools:1.1.0 /tools/pigz/2.8/pigz /usr/local/bin/
7+
COPY --from=ghcr.io/virtool/tools:1.1.0 /tools/samtools/1.22.1/bin/samtools /usr/local/bin/
78
RUN apt-get update && \
89
apt-get install -y --no-install-recommends default-jre && \
910
rm -rf /var/lib/apt/lists/* && \

fixtures.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ def isolate_index_path(isolate_path: Path):
3737

3838

3939
@fixture
40-
def isolate_sam_path(isolate_path: Path):
41-
return isolate_path / "to_isolates.sam"
40+
def isolate_bam_path(isolate_path: Path):
41+
return isolate_path / "to_isolates.bam"
4242

4343

4444
@fixture

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ authors = [
1919
[dependency-groups]
2020
dev = [
2121
"maturin>=1.9.2",
22+
"pysam>=0.22.0",
2223
"pytest>=7.4.2,<8.0.0",
2324
"pytest-asyncio<=0.23.8,<1.0.0",
2425
"pytest-mock<=3.14,<4.0.0",

0 commit comments

Comments
 (0)