Merge pull request #644 from MaxUlysse/dev

Preparing release 2.2.0
SciLifeLab · Sep 21, 2018 · 2038a57 · 2038a57
2 parents 1539230 + 9f80f02
commit 2038a57
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.2.0] - Skårki - 2018-09-21
+
 ### `Added`
 
 -   [#613](https://github.com/SciLifeLab/Sarek/pull/613) - Add Issue Templates (bug report and feature request)
@@ -32,7 +34,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 -   [#637](https://github.com/SciLifeLab/Sarek/pull/637) - Update tool version gathering
 -   [#638](https://github.com/SciLifeLab/Sarek/pull/638) - Use correct `.simg` extension for Singularity images
 -   [#639](https://github.com/SciLifeLab/Sarek/pull/639) - Smaller refactoring of the docs
--   [#640](https://github.com/SciLifeLab/Sarek/pull/640) - Update RELEASE\_CHECKLIST
+-   [#640](https://github.com/SciLifeLab/Sarek/pull/640) - Update RELEASE_CHECKLIST
 -   [#642](https://github.com/SciLifeLab/Sarek/pull/642) - Update conda channel order priorities
 -   [#642](https://github.com/SciLifeLab/Sarek/pull/642) - MultiQC 1.5 -> 1.6
 -   [#642](https://github.com/SciLifeLab/Sarek/pull/642) - Qualimap 2.2.2a -> 2.2.2b

diff --git a/Dockerfile b/Dockerfile
@@ -7,4 +7,4 @@ LABEL \
 
 COPY environment.yml /
 RUN conda env create -f /environment.yml && conda clean -a
-ENV PATH /opt/conda/envs/sarek-2.1.0/bin:$PATH
+ENV PATH /opt/conda/envs/sarek-2.2.0/bin:$PATH
diff --git a/Singularity b/Singularity
@@ -7,7 +7,7 @@ Bootstrap:docker
     VERSION 2.1.0
 
 %environment
-    PATH=/opt/conda/envs/sarek-2.1.0/bin:$PATH
+    PATH=/opt/conda/envs/sarek-2.2.0/bin:$PATH
     export PATH
 
 %files

diff --git a/conf/base.config b/conf/base.config
@@ -36,7 +36,7 @@ params {
   targetBED = false // no targets by default
   test = false // Not testing by default
   verbose = false // Enable for more verbose information
-  version = '2.1.0' // Workflow version
+  version = '2.2.0' // Workflow version
 }
 
 process {

diff --git a/environment.yml b/environment.yml
@@ -1,6 +1,6 @@
 # You can use this file to create a conda environment for this pipeline:
 # conda env create -f environment.yml
-name: sarek-2.1.0
+name: sarek-2.2.0
 channels:
   - conda-forge
   - bioconda