From 0ad36e5304fd761978ac000c2a50845de8f5d7c0 Mon Sep 17 00:00:00 2001
From: dpryan79 <dpryan79@gmail.com>
Date: Tue, 27 Nov 2018 11:48:07 +0100
Subject: [PATCH 1/4] The previous dan_mapping.yaml env couldn't be solved. I
 have no clue why, I expect this is a transient GCC7 issue, but this solves
 that.

---
 snakePipes/shared/rules/envs/dna_mapping.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/snakePipes/shared/rules/envs/dna_mapping.yaml b/snakePipes/shared/rules/envs/dna_mapping.yaml
index 9fd0911c7..de74a6616 100644
--- 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

From c8c37977a31c30d10786fead8c4e3b7d0fb0dca7 Mon Sep 17 00:00:00 2001
From: dpryan79 <dpryan79@gmail.com>
Date: Tue, 27 Nov 2018 11:50:07 +0100
Subject: [PATCH 2/4] Start bumping version to 1.1.1

---
 conda-recipe/meta.yaml | 2 +-
 snakePipes/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index 2fcb66c03..5f2555766 100644
--- 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/snakePipes/__init__.py b/snakePipes/__init__.py
index 1a72d32e5..b3ddbc41f 100644
--- a/snakePipes/__init__.py
+++ b/snakePipes/__init__.py
@@ -1 +1 @@
-__version__ = '1.1.0'
+__version__ = '1.1.1'

From 71a99fcef044c6e47896564edcca2eb6abd47085 Mon Sep 17 00:00:00 2001
From: dpryan79 <dpryan79@gmail.com>
Date: Tue, 27 Nov 2018 12:05:48 +0100
Subject: [PATCH 3/4] Update some dependencies in the hic env

---
 snakePipes/shared/rules/envs/hic.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snakePipes/shared/rules/envs/hic.yaml b/snakePipes/shared/rules/envs/hic.yaml
index cbf9d8833..a34b84141 100644
--- 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

From 2d0e33959c3d9fc380081945096fcc0487252497 Mon Sep 17 00:00:00 2001
From: dpryan79 <dpryan79@gmail.com>
Date: Tue, 27 Nov 2018 14:04:36 +0100
Subject: [PATCH 4/4] docs

---
 docs/content/News.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/content/News.rst b/docs/content/News.rst
index 341776919..f632370c1 100644
--- 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
 ----------------