Merge pull request #345 from maxplanck-ie/env_update

Env update
maxplanck-ie · Nov 27, 2018 · a6cea0b · a6cea0b
2 parents 1c4c344 + 393be59
commit a6cea0b
Show file tree

Hide file tree

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

diff --git a/docs/content/News.rst b/docs/content/News.rst
@@ -1,6 +1,12 @@
 snakePipes News
 ===============
 
+snakePipes 1.1.1
+----------------
+
+ * Fixed some conda environments so they could all be solved in a reasonable amount of time.
+ * Updated some WGBS memory limits
+
 snakePipes 1.1.0
 ----------------
 

diff --git a/snakePipes/__init__.py b/snakePipes/__init__.py
@@ -1 +1 @@
-__version__ = '1.1.0'
+__version__ = '1.1.1'
diff --git a/snakePipes/shared/rules/envs/dna_mapping.yaml b/snakePipes/shared/rules/envs/dna_mapping.yaml
@@ -3,6 +3,6 @@ channels:
  - conda-forge
  - bioconda
 dependencies:
- - bowtie2 = 2.3.4.1
- - qualimap = 2.2.2a
- - samtools=1.7
+ - bowtie2 = 2.3.4.3
+ - qualimap = 2.2.2b
+ - samtools=1.9
diff --git a/snakePipes/shared/rules/envs/hic.yaml b/snakePipes/shared/rules/envs/hic.yaml
@@ -5,5 +5,5 @@ channels:
 dependencies:
  - hicexplorer = 2.1.4
  - bwa = 0.7.17
- - samtools = 1.8
- - python-dateutil = 2.7.3
+ - samtools = 1.9
+ - python-dateutil = 2.7.5