Merge pull request #729 from maxplanck-ie/develop

Develop
maxplanck-ie · Nov 19, 2020 · c1ca589 · c1ca589
2 parents 3f3d2bf + 0faa0ef
commit c1ca589
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: snakepipes
-  version: 2.4.0
+  version: 2.4.1
 
 source:
   path: ../

diff --git a/docs/content/News.rst b/docs/content/News.rst
@@ -1,6 +1,11 @@
 snakePipes News
 ===============
 
+snakePipes 2.4.1
+----------------
+
+* Fixed sampleSheet splitting for multiple pairwise comparisons when group "All" is not listed.
+
 snakePipes 2.4.0
 ----------------
 

diff --git a/docs/content/setting_up.rst b/docs/content/setting_up.rst
@@ -34,7 +34,7 @@ The easiest way to install snakePipes is via our conda channel. The following co
 
 .. code:: bash
 
-    conda create -n snakePipes -c mpi-ie -c conda-forge -c bioconda snakePipes==2.4.0
+    conda create -n snakePipes -c mpi-ie -c conda-forge -c bioconda snakePipes==2.4.1
 
 This way, the software used within snakePipes do not conflict with the software pre-installed on your terminal or in your python environment.
 

diff --git a/docs/index.rst b/docs/index.rst
@@ -34,7 +34,7 @@ Quick start
 
 .. code:: bash
 
-    conda create -n snakePipes -c mpi-ie -c conda-forge -c bioconda snakePipes==2.4.0
+    conda create -n snakePipes -c mpi-ie -c conda-forge -c bioconda snakePipes==2.4.1
 
 * You can update snakePipes to the latest version available on conda with:
 

diff --git a/snakePipes/__init__.py b/snakePipes/__init__.py
@@ -1 +1 @@
-__version__ = '2.4.0'
+__version__ = '2.4.1'
diff --git a/snakePipes/common_functions.py b/snakePipes/common_functions.py
@@ -289,11 +289,11 @@ def splitSampleSheet(sampleSheet, destination_pfx):
     for k in d.keys():
         if k != "All" and "All" in d.keys():
             d[k].extend(d['All'])
-            outfile = os.path.join("splitSampleSheets", '.'.join([os.path.basename(destination_pfx), k, 'tsv']))
-            with open(outfile, 'w') as of:
-                of.write('name\tcondition\n')
-                for item in d[k]:
-                    of.write('\t'.join(item) + '\n')
+        outfile = os.path.join("splitSampleSheets", '.'.join([os.path.basename(destination_pfx), k, 'tsv']))
+        with open(outfile, 'w') as of:
+            of.write('name\tcondition\n')
+            for item in d[k]:
+                of.write('\t'.join(item) + '\n')
 
     return