Merge pull request #500 from maxplanck-ie/macs2

Macs2 and bump version
maxplanck-ie · Oct 7, 2019 · 5b01b1f · 5b01b1f
2 parents bc1c483 + 27b3557
commit 5b01b1f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: snakepipes
-  version: 1.2.3
+  version: 1.3.0
 
 source:
   path: ../

diff --git a/snakePipes/__init__.py b/snakePipes/__init__.py
@@ -1 +1 @@
-__version__ = '1.2.3'
+__version__ = '1.3.0'
diff --git a/snakePipes/shared/rules/envs/atac_seq.yaml b/snakePipes/shared/rules/envs/atac_seq.yaml
@@ -9,7 +9,7 @@ dependencies:
  - bioconductor-genomeinfodbdata = 1.2.1
  - bioconductor-genomicranges = 1.34.0
  - bioconductor-genomeinfodbdata = 1.2.1
- - macs2 = 2.1.2  #python 2
+ - macs2 = 2.2.4
  - gawk = 4.2.1
  - r-kernsmooth = 2.23_15
  - r-statmod = 1.4.30

diff --git a/snakePipes/shared/rules/envs/chip_seq.yaml b/snakePipes/shared/rules/envs/chip_seq.yaml
@@ -3,6 +3,5 @@ channels:
  - conda-forge
  - bioconda
 dependencies:
- - samtools = 1.9
- - macs2 = 2.1.2  #python 2
- - tabix = 0.2.6
+ - samtools = 1.9  # This should pull in tabix via htslib as well
+ - macs2 = 2.2.4