Skip to content

Commit

Permalink
Merge pull request #67 from friendsofstrandseq/weber8thomas/clean-con…
Browse files Browse the repository at this point in the history
…da-envs

Weber8thomas/clean conda envs
  • Loading branch information
weber8thomas authored Jul 30, 2024
2 parents 9ff2502 + c322ff4 commit 87692c0
Show file tree
Hide file tree
Showing 11 changed files with 300 additions and 73 deletions.
2 changes: 1 addition & 1 deletion .tests
Submodule .tests updated 68 files
+0 −2 .gitattributes
+2 −0 .gitattributes.bak
+1 −1 config/simple_config_ashleys.yaml
+2 −2 config/simple_config_mosaicatcher.yaml
+ data_CHR17/RPE-BM510/bam/BM510x04_PE20301.sort.mdup.bam
+ data_CHR17/RPE-BM510/bam/BM510x04_PE20302.sort.mdup.bam
+ data_CHR17/RPE-BM510/bam/BM510x04_PE20303.sort.mdup.bam
+ data_CHR17/RPE-BM510/bam/BM510x04_PE20304.sort.mdup.bam
+ data_CHR17/RPE-BM510/bam/BM510x04_PE20305.sort.mdup.bam
+ data_CHR17/RPE-BM510/bam/BM510x04_PE20306.sort.mdup.bam
+ data_CHR17/RPE-BM510/bam/BM510x04_PE20307.sort.mdup.bam
+ data_CHR17/RPE-BM510/bam/BM510x04_PE20308.sort.mdup.bam
+ data_CHR17/RPE-BM510/bam/BM510x04_PE20309.sort.mdup.bam
+ data_CHR17/RPE-BM510/bam/BM510x04_PE20310.sort.mdup.bam
+ data_CHR17/RPE-BM510/bam/BM510x04_PE20311.sort.mdup.bam
+ data_CHR17/RPE-BM510/bam/BM510x04_PE20312.sort.mdup.bam
+ data_CHR17/RPE-BM510/bam/BM510x04_PE20313.sort.mdup.bam
+ data_CHR17/RPE-BM510/bam/BM510x04_PE20314.sort.mdup.bam
+ data_CHR17/RPE-BM510/bam/BM510x04_PE20316.sort.mdup.bam
+ data_CHR17/RPE-BM510/bam/BM510x04_PE20317.sort.mdup.bam
+ data_CHR17/RPE-BM510/bam/BM510x04_PE20318.sort.mdup.bam
+ data_CHR17/RPE-BM510/bam/BM510x04_PE20319.sort.mdup.bam
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20301.1.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20301.2.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20302.1.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20302.2.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20303.1.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20303.2.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20304.1.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20304.2.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20305.1.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20305.2.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20306.1.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20306.2.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20307.1.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20307.2.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20308.1.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20308.2.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20309.1.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20309.2.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20310.1.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20310.2.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20311.1.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20311.2.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20312.1.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20312.2.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20313.1.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20313.2.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20314.1.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20314.2.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20316.1.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20316.2.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20317.1.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20317.2.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20318.1.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20318.2.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20319.1.fastq.gz
+ data_CHR17/RPE-BM510/fastq/BM510x04_PE20319.2.fastq.gz
+17 −3 data_CHR17/RPE-BM510/scNOVA_input_user/input_subclonality.txt
+0 −3 external_data/chr17.fa
+0 −3 external_data/chr17.fa.amb
+0 −3 external_data/chr17.fa.ann
+0 −3 external_data/chr17.fa.bwt
+0 −3 external_data/chr17.fa.fai
+ external_data/chr17.fa.gz
+0 −3 external_data/chr17.fa.gzi
+0 −3 external_data/chr17.fa.pac
+0 −3 external_data/chr17.fa.sa
4 changes: 2 additions & 2 deletions config/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
# --------------------------------------------------------

# MosaiCatcher version
version: 2.3.4
version: 2.3.5

# Ashleys-QC pipeline version
ashleys_pipeline_version: 2.3.4
ashleys_pipeline_version: 2.3.5

# Email for notifications about the pipeline's status
email: ""
Expand Down
255 changes: 255 additions & 0 deletions github-actions-runner/Dockerfile-2.3.5.dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,255 @@
FROM condaforge/mambaforge:latest
LABEL io.github.snakemake.containerized="true"
LABEL io.github.snakemake.conda_env_hash="72e8bd41499b7a00b23bf8b7611bc709b4cf39ef9dda6af310328b74cc86321b"

# Step 1: Retrieve conda environments

# Conda environment:
# source: https://github.com/friendsofstrandseq/ashleys-qc-pipeline/raw/2.3.5/workflow/envs/ashleys_base.yaml
# prefix: /conda-envs/32c736a65a401b33605acfa7a0241299
# name: ashleys_base
# channels:
# - conda-forge
# - bioconda
# dependencies:
# - ashleys-qc
# - bwa
# - mosaicatcher
# - multiqc
# - pandas
# - python=3.10
# - pysam
# - rsync
# - sambamba
# - samtools
# - scikit-learn=1.2.2
# - tabix
RUN mkdir -p /conda-envs/32c736a65a401b33605acfa7a0241299
ADD https://github.com/friendsofstrandseq/ashleys-qc-pipeline/raw/2.3.5/workflow/envs/ashleys_base.yaml /conda-envs/32c736a65a401b33605acfa7a0241299/environment.yaml

# Conda environment:
# source: https://github.com/friendsofstrandseq/ashleys-qc-pipeline/raw/2.3.5/workflow/envs/ashleys_rtools.yaml
# prefix: /conda-envs/fc1f554e9ee82b99f4350430ee3ae0a0
# name: rtools
# channels:
# - conda-forge
# - bioconda
# dependencies:
# - bioconductor-edger
# - bioconductor-genomicranges
# - fonts-conda-forge
# - r-assertthat
# - r-base
# - r-cairo
# - r-cowplot
# - r-data.table
# - r-dplyr
# - r-ggplot2
# - r-ggpubr
# - r-platetools
# - r-r.utils
# - r-rcolorbrewer
# - r-reshape2
# - r-scales
# - r-stringi=1.7.12
# - r-tidyr
# - r-viridis
RUN mkdir -p /conda-envs/fc1f554e9ee82b99f4350430ee3ae0a0
ADD https://github.com/friendsofstrandseq/ashleys-qc-pipeline/raw/2.3.5/workflow/envs/ashleys_rtools.yaml /conda-envs/fc1f554e9ee82b99f4350430ee3ae0a0/environment.yaml

# Conda environment:
# source: https://github.com/snakemake/snakemake-wrappers/raw/v1.7.0/bio/bwa/index/environment.yaml
# prefix: /conda-envs/5681728a49bd83ceed09ba194330c858
# channels:
# - bioconda
# - conda-forge
# - defaults
# dependencies:
# - bwa ==0.7.17
RUN mkdir -p /conda-envs/5681728a49bd83ceed09ba194330c858
ADD https://github.com/snakemake/snakemake-wrappers/raw/v1.7.0/bio/bwa/index/environment.yaml /conda-envs/5681728a49bd83ceed09ba194330c858/environment.yaml

# Conda environment:
# source: https://github.com/snakemake/snakemake-wrappers/raw/v1.7.0/bio/fastqc/environment.yaml
# prefix: /conda-envs/08d4368302a4bdf7eda6b536495efe7d
# channels:
# - bioconda
# - conda-forge
# - defaults
# dependencies:
# - fastqc ==0.11.9
RUN mkdir -p /conda-envs/08d4368302a4bdf7eda6b536495efe7d
ADD https://github.com/snakemake/snakemake-wrappers/raw/v1.7.0/bio/fastqc/environment.yaml /conda-envs/08d4368302a4bdf7eda6b536495efe7d/environment.yaml

# Conda environment:
# source: workflow/envs/mc_base.yaml
# prefix: /conda-envs/e5cbb476a12203f97f2a0bb44963061d
# name: mc-base
# channels:
# - conda-forge
# - bioconda
# dependencies:
# - intervaltree
# - matplotlib
# - pandas
# - parmap
# - perl
# - pybigwig
# - pypdf2
# - pysam
# - pytables
# - pyyaml
# - samtools
# - scipy
# - seaborn
# - tqdm
# - xopen
RUN mkdir -p /conda-envs/e5cbb476a12203f97f2a0bb44963061d
COPY workflow/envs/mc_base.yaml /conda-envs/e5cbb476a12203f97f2a0bb44963061d/environment.yaml

# Conda environment:
# source: workflow/envs/mc_bioinfo_tools.yaml
# prefix: /conda-envs/f251d84cdc9f25d0e14b48e780261d66
# name: mc-bioinfo-tools
# channels:
# - conda-forge
# - bioconda
# dependencies:
# - bcftools
# - freebayes
# - mosaicatcher
# - samtools
# - tabix
# - whatshap
RUN mkdir -p /conda-envs/f251d84cdc9f25d0e14b48e780261d66
COPY workflow/envs/mc_bioinfo_tools.yaml /conda-envs/f251d84cdc9f25d0e14b48e780261d66/environment.yaml

# Conda environment:
# source: workflow/envs/rtools.yaml
# prefix: /conda-envs/905757e298f80370141afb02667ced2e
# name: rtools
# channels:
# - bioconda
# - conda-forge
# dependencies:
# - bioconductor-biocparallel
# - bioconductor-breakpointr
# - bioconductor-bsgenome
# - bioconductor-bsgenome.hsapiens.ucsc.hg38
# - bioconductor-complexheatmap
# - bioconductor-edger
# - bioconductor-genomicalignments
# - bioconductor-genomicranges
# - bioconductor-rsamtools
# - fonts-conda-forge
# - r-assertthat
# - r-base
# - r-biocmanager
# - r-cairo
# - r-cowplot
# - r-data.table
# - r-devtools
# - r-doparallel
# - r-dplyr
# - r-foreach
# - r-ggbeeswarm
# - r-ggnewscale
# - r-ggplot2
# - r-ggpubr
# - r-gplots
# - r-gtools
# - r-mc2d
# - r-optparse
# - r-pheatmap
# - r-r.utils
# - r-rcolorbrewer
# - r-reshape
# - r-reshape2
# - r-scales
# - r-stringi=1.7.12
# - r-stringr
# - r-tidyr
# - r-tidyr
# - strandphaser
RUN mkdir -p /conda-envs/905757e298f80370141afb02667ced2e
COPY workflow/envs/rtools.yaml /conda-envs/905757e298f80370141afb02667ced2e/environment.yaml

# Conda environment:
# source: workflow/envs/scNOVA/scNOVA_DL.yaml
# prefix: /conda-envs/fdeedf32561210c2a9762946a26b4cca
# name: scNOVA_DL
# channels:
# - conda-forge
# dependencies:
# - h5py=2.10.0
# - matplotlib=3.1.1
# - numpy
# - pandas=0.25.3
# - python=3.7.4
# - scikit-learn=0.21.3
# - tensorflow=1.15.0
# - unzip
# - pip:
# - cffi
RUN mkdir -p /conda-envs/fdeedf32561210c2a9762946a26b4cca
COPY workflow/envs/scNOVA/scNOVA_DL.yaml /conda-envs/fdeedf32561210c2a9762946a26b4cca/environment.yaml

# Conda environment:
# source: workflow/envs/scNOVA/scNOVA_R.yaml
# prefix: /conda-envs/e4c4fbc0d8d5fdeeb1f51bb8c0e86716
# name: scNOVA
# channels:
# - bioconda
# - conda-forge
# dependencies:
# - bioconductor-bsgenome.hsapiens.ucsc.hg38=1.4.3
# - bioconductor-chromvar=1.12.0
# - bioconductor-deseq2=1.30.0
# - bioconductor-jaspar2016=1.18.0
# - bioconductor-motifmatchr=1.12.0
# - r-codetools=0.2_18
# - r-doparallel
# - r-factoextra=1.0.7
# - r-fitdistrplus
# - r-foreach
# - r-gplots=3.1.1
# - r-matrixstats=0.58.0
# - r-nabor=0.5.0
# - r-pheatmap=1.0.12
# - r-pracma=2.3.3
# - r-rtsne=0.15
# - r-umap=0.2.7.0
RUN mkdir -p /conda-envs/e4c4fbc0d8d5fdeeb1f51bb8c0e86716
COPY workflow/envs/scNOVA/scNOVA_R.yaml /conda-envs/e4c4fbc0d8d5fdeeb1f51bb8c0e86716/environment.yaml

# Conda environment:
# source: workflow/envs/scNOVA/scNOVA_bioinfo_tools.yaml
# prefix: /conda-envs/8b150c19ea62e29d0bbc47d682a8db8e
# name: scNOVA_bioinfo_tools
# channels:
# - conda-forge
# - bioconda
# dependencies:
# - bedtools
# - biobambam
# - samtools
RUN mkdir -p /conda-envs/8b150c19ea62e29d0bbc47d682a8db8e
COPY workflow/envs/scNOVA/scNOVA_bioinfo_tools.yaml /conda-envs/8b150c19ea62e29d0bbc47d682a8db8e/environment.yaml

# Step 2: Generate conda environments

RUN mamba env create --prefix /conda-envs/32c736a65a401b33605acfa7a0241299 --file /conda-envs/32c736a65a401b33605acfa7a0241299/environment.yaml && \
mamba env create --prefix /conda-envs/fc1f554e9ee82b99f4350430ee3ae0a0 --file /conda-envs/fc1f554e9ee82b99f4350430ee3ae0a0/environment.yaml && \
mamba env create --prefix /conda-envs/5681728a49bd83ceed09ba194330c858 --file /conda-envs/5681728a49bd83ceed09ba194330c858/environment.yaml && \
mamba env create --prefix /conda-envs/08d4368302a4bdf7eda6b536495efe7d --file /conda-envs/08d4368302a4bdf7eda6b536495efe7d/environment.yaml && \
mamba env create --prefix /conda-envs/e5cbb476a12203f97f2a0bb44963061d --file /conda-envs/e5cbb476a12203f97f2a0bb44963061d/environment.yaml && \
mamba env create --prefix /conda-envs/f251d84cdc9f25d0e14b48e780261d66 --file /conda-envs/f251d84cdc9f25d0e14b48e780261d66/environment.yaml && \
mamba env create --prefix /conda-envs/905757e298f80370141afb02667ced2e --file /conda-envs/905757e298f80370141afb02667ced2e/environment.yaml && \
mamba env create --prefix /conda-envs/fdeedf32561210c2a9762946a26b4cca --file /conda-envs/fdeedf32561210c2a9762946a26b4cca/environment.yaml && \
mamba env create --prefix /conda-envs/e4c4fbc0d8d5fdeeb1f51bb8c0e86716 --file /conda-envs/e4c4fbc0d8d5fdeeb1f51bb8c0e86716/environment.yaml && \
mamba env create --prefix /conda-envs/8b150c19ea62e29d0bbc47d682a8db8e --file /conda-envs/8b150c19ea62e29d0bbc47d682a8db8e/environment.yaml && \
mamba clean --all -y
# CUSTOM PART
RUN wget https://zenodo.org/record/7697400/files/BSgenome.T2T.CHM13.V2_1.0.0.tar.gz -P /workflow/data/ref_genomes/
COPY /workflow/scripts/utils/install_R_package.R /conda-envs/
RUN chmod -R 0777 /conda-envs/905757e298f80370141afb02667ced2e/lib/R/library && /conda-envs/905757e298f80370141afb02667ced2e/bin/Rscript /conda-envs/install_R_package.R /workflow/data/ref_genomes/BSgenome.T2T.CHM13.V2_1.0.0.tar.gz
2 changes: 1 addition & 1 deletion workflow/data
Submodule data updated 44 files
+0 −8 .gitattributes
+ GC/T2T.GC_matrix.txt.gz
+ GC/hg19.GC_matrix.txt.gz
+ GC/hg38.GC_matrix.txt.gz
+ GC/mm10.GC_matrix.txt.gz
+487 −3 arbigent/manual_segmentation.bed
+23 −3 arbigent/manual_segmentation_chr17.bed
+30,583 −3 arbigent/normalization/T2T/HGSVC.100000.txt
+15,285 −3 arbigent/normalization/T2T/HGSVC.200000.txt
+61,110 −3 arbigent/normalization/T2T/HGSVC.50000.txt
+30,377 −3 arbigent/normalization/hg19/HGSVC.100000.txt
+15,193 −3 arbigent/normalization/hg19/HGSVC.200000.txt
+60,740 −3 arbigent/normalization/hg19/HGSVC.50000.txt
+30,322 −3 arbigent/normalization/hg38/HGSVC.100000.txt
+15,167 −3 arbigent/normalization/hg38/HGSVC.200000.txt
+60,631 −3 arbigent/normalization/hg38/HGSVC.50000.txt
+26,351 −3 arbigent/normalization/mm10/HGSVC.100000.txt
+13,182 −3 arbigent/normalization/mm10/HGSVC.200000.txt
+52,686 −3 arbigent/normalization/mm10/HGSVC.50000.txt
+29 −3 arbigent/paper_backup/manual_segmentation_validation_paper.bed
+10 −3 arbigent/paper_backup/manual_segmentation_validation_paper.wt_noise.bed
+15,453 −3 bin_200kb_all.bed
+13,640 −3 mm10.bin_200kb_all.bed
+30,583 −3 normalization/T2T/HGSVC.100000.txt
+15,285 −3 normalization/T2T/HGSVC.200000.txt
+61,110 −3 normalization/T2T/HGSVC.50000.txt
+30,377 −3 normalization/hg19/HGSVC.100000.txt
+15,193 −3 normalization/hg19/HGSVC.200000.txt
+60,740 −3 normalization/hg19/HGSVC.50000.txt
+30,322 −3 normalization/hg38/HGSVC.100000.centromere-only.txt
+30,322 −3 normalization/hg38/HGSVC.100000.txt
+15,167 −3 normalization/hg38/HGSVC.200000.centromere-only.txt
+15,167 −3 normalization/hg38/HGSVC.200000.txt
+60,631 −3 normalization/hg38/HGSVC.50000.centromere-only.txt
+60,631 −3 normalization/hg38/HGSVC.50000.txt
+307 −3 normalization/inversion-whitelist.tsv
+26,351 −3 normalization/mm10/HGSVC.100000.txt
+13,182 −3 normalization/mm10/HGSVC.200000.txt
+52,686 −3 normalization/mm10/HGSVC.50000.txt
+385 −3 plotting/384_1A3C5E7G_correspondance_table.tsv
+19,771 −3 scNOVA_input_SV_affected_genes.txt
+ segdups/segDups_T2T_UCSCtrack.bed.gz
+ segdups/segDups_hg19_UCSCtrack.bed.gz
+ segdups/segDups_hg38_UCSCtrack.bed.gz
6 changes: 0 additions & 6 deletions workflow/envs/global.yaml

This file was deleted.

22 changes: 9 additions & 13 deletions workflow/envs/mc_base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,18 @@ channels:
- conda-forge
- bioconda
dependencies:
- pandas
- intervaltree
- scipy
- pysam
- tqdm
- matplotlib
- pandas
- parmap
- perl
- pybigwig
- pypdf2
- parmap
# NEW
- pysam
- pytables
- pyyaml
- seaborn
- matplotlib
# SOLVE se-pe detection
- samtools
# ArbiGent Hufsah deps
- pytables
- scipy
- seaborn
- tqdm
- xopen
# Fix jbrowse tracks generation
- pybigwig
37 changes: 12 additions & 25 deletions workflow/envs/rtools.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,17 @@ name: rtools
channels:
- bioconda
- conda-forge
- r
- anaconda
dependencies:
# # NEW
- strandphaser
# ###############
- bioconductor-biocparallel
- bioconductor-breakpointr
- bioconductor-bsgenome
- bioconductor-bsgenome.hsapiens.ucsc.hg38
- bioconductor-complexheatmap
# - bioconductor-fastseg
- bioconductor-edger
- bioconductor-genomicalignments
- bioconductor-genomicranges
- bioconductor-rsamtools
# - bioconductor-s4vectors
- fonts-anaconda
- fonts-conda-forge
- r-assertthat
- r-base
- r-biocmanager
Expand All @@ -28,30 +23,22 @@ dependencies:
- r-doparallel
- r-dplyr
- r-foreach
- r-ggbeeswarm
- r-ggnewscale
- r-ggplot2
- r-ggpubr
- r-gplots
- r-gtools
- r-mc2d
- r-optparse
- r-pheatmap
- r-r.utils
- r-rcolorbrewer
- r-reshape
- r-reshape2
- r-scales
- r-stringi=1.7.12
- r-stringr
# SV_CALLS_DEV
# - r-zoo
- r-r.utils
- r-ggnewscale
# HEATMAP
- r-tidyr
# ARBIGENT
- r-reshape
- r-optparse
- r-tidyr
- r-ggbeeswarm
- r-pheatmap
# GC_correction
- r-ggpubr
- bioconductor-edger
# SOLVE R lib issue
- r-stringi=1.7.12
# breakpointr
- bioconductor-breakpointr
- strandphaser
Loading

0 comments on commit 87692c0

Please sign in to comment.