Skip to content

Commit

Permalink
Merge pull request #111 from baigal628/master
Browse files Browse the repository at this point in the history
New Release for v1.3.2
  • Loading branch information
crazyhottommy authored Jan 29, 2021
2 parents 82ceaf9 + 879f15a commit b21482b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ rule scatac_countpeak_batch:
input:
finalpeak = "Result/Analysis/Batch/all_samples_peaks.bed",
validbarcode = "Result/QC/{sample}/{sample}_scATAC_validcells.txt",
frag = get_fragments
frag = "Result/minimap2/{sample}/fragments_corrected_dedup_count.tsv"
output:
counts = "Result/Analysis/Batch/{sample}/{sample}_peak_count.h5"
params:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ $ conda config --add channels bioconda
$ conda config --add channels conda-forge
# To make the installation faster, we recommend using mamba
$ conda install mamba -c conda-forge
$ mamba create -n MAESTRO maestro=1.3.1 -c liulab-dfci
$ mamba create -n MAESTRO maestro=1.3.2 -c liulab-dfci
# Activate the environment
$ conda activate MAESTRO
```
Expand Down
18 changes: 9 additions & 9 deletions conda/MAESTRO/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ requirements:
- snakemake >=5.14
- rseqc >=3.0.0
- star =2.7.6a
- minimap2 >=2.17
- samtools >=1.9
- bedtools >=2.29.2
- minimap2 =2.17
- samtools =1.10
- bedtools =2.29.2
- rsem >=1.3.2
- picard >=2.22.0
- macs2 >=2.2.6
- macs2 =2.2.7.1
- lisa2 =2.2.2
- umap-learn
- pysam # this is needed by sinto
Expand Down Expand Up @@ -86,13 +86,13 @@ requirements:
- snakemake >=5.14
- rseqc >=3.0.0
- star =2.7.6a
- minimap2 >=2.17
- samtools >=1.9
- bedtools >=2.29.2
- minimap2 =2.17
- samtools =1.10
- bedtools =2.29.2
- rsem >=1.3.2
- picard >=2.22.0
- macs2 >=2.2.6
- lisa2 >=2.1.0
- macs2 =2.2.7.1
- lisa2 =2.2.2
- umap-learn
- pysam # this is needed by sinto
- r-base >=4.0.2
Expand Down

0 comments on commit b21482b

Please sign in to comment.