Merge branch 'develop'

flo-compbio · Sep 4, 2016 · afdb8c7 · afdb8c7
2 parents 8567e3e + 988c9f1
commit afdb8c7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -35,6 +35,7 @@ notifications:
 deploy:
   provider: pypi
   user: flo-compbio
+  distributions: "sdist bdist_wheel"
   password:
     secure: PYkwn05UEcE0zWAT9/IyZwaZTETZTF5uNUhiz70g8KVTuZ9e2nRPnbW0EGCm+DmusWsOxEAJOFj8evKl8/Qd6wNWt0OZ/t1ynbxb06h7YWShat8KfXA/0OpRTo1+djn2nZw+DIFBBNO+zkiVBu/Zgl/2VG/BZ8uPRbxi+GqyTJnpSYja0kxNYD/hTQbaM/HPykn4kfzXGmikcEcV6m79J5jUtzabUUo7DDEForR2rXtgb2suZ7+qvxGWT1BtTQNPiuTdOWm65si9Y2QzxGRgcTxtd5mK234UoTz4f7ULPHH2/bW/7eI7D9L7JRayvn3npzbTsdW51yT1/KqTVo9VFl6KYUu0Fo5MUtfUMyi386hpk42YKnIn7YdZoSS50hhzN/TA0gKawjFqveE9XHB+jale4x6J1sR7EKYFMqFsKgX1QacRncw8z8aNBwANU5SFJordYeMW0elK6C+2ZDlaSb61Chrb/ghRsug4zWE7ZGyeUAZMJNg69xuPbtbYp6TpscKAYeyT+xgNi96eyonOiUGTu4FhAvYDf1N5X+w5U2RO+XOzeEayBqTJuf2nFuK3r2eVH6hn2Btw4eekIsQSqWFHLOm93bbJ2vDQNeMRNFky2mAYUPUcppePN1zrH3h/CpC24rer+iKTS2uYD24r56Y3EdRer6ki4bRrKuWe4h0=
   on:

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -43,6 +43,12 @@ Version 2.1.0 (2016-08-28)
   and signature genes to the Python API: `GOPCASignatureMatrix.get_figure()`
   and `GOPCASignature.get_figure()`.
 
+2.1.1 (2016-09-04)
+~~~~~~~~~~~~~~~~~~
+
+- Travis deploy step now generates and uploads wheels.
+- Fixed bug in `GOPCASignatureMatrix.filter_collection_signatures()`.
+
 Version 2.0.0 (2016-08-01)
 --------------------------
 

diff --git a/gopca/signature_matrix.py b/gopca/signature_matrix.py
@@ -252,11 +252,13 @@ def filter_collection_signatures(self, corr_thresh=0.9, source=None):
                 if r >= corr_thresh:
                     # signature is too highly correlated => exclude
                     logger.debug('Excluding signature "%s" due to correlation'
-                                 'with "%s".', sig.label, other.label)
+                                 'with "%s".', other.label, sig.label)
                     sel[i2] = False
 
         sel = np.nonzero(sel)[0]
-        sig_matrix.signatures = [sig_matrix.signatures[i] for i in sel]
+        sig_matrix = GOPCASignatureMatrix.from_signatures(
+            sig_matrix.signatures[i] for i in sel
+        )
         return sig_matrix
 
     @property

diff --git a/setup.py b/setup.py
@@ -61,7 +61,7 @@
 setup(
     name='gopca',
 
-    version='2.1.0',
+    version='2.1.1',
 
     description=description,
     long_description=long_description,