msreport 0.0.25__py3-none-any.whl → 0.0.26__py3-none-any.whl

msreport/__init__.py

@@ -10,4 +10,4 @@ import msreport.normalize
 import msreport.plot
 import msreport.reader
 
-__version__ = "0.0.25"
+__version__ = "0.0.26"

msreport/helper/table.py

@@ -176,12 +176,22 @@ def find_sample_columns(
             columns.
 
     Returns:
-        A list of sample column names.
+        A list of column names containing the substring and any entry of 'samples'.
+        Columns are returned in the order of entries in 'samples'.
     """
+    WHITESPACE_CHARS = " ."
+
     matched_columns = []
-    for column in find_columns(table, substring):
-        if any([sample in column for sample in samples]):
-            matched_columns.append(column)
+    substring_columns = find_columns(table, substring)
+    for sample in samples:
+        sample_columns = [c for c in substring_columns if sample in c]
+        for col in sample_columns:
+            column_remainder = (
+                col.replace(substring, "").replace(sample, "").strip(WHITESPACE_CHARS)
+            )
+            if column_remainder == "":
+                matched_columns.append(col)
+                break
     return matched_columns
 
 

{msreport-0.0.25.dist-info → msreport-0.0.26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: msreport
-Version: 0.0.25
+Version: 0.0.26
 Summary: Post processing and analysis of quantitative proteomics data
 Author-email: "David M. Hollenstein" <hollenstein.david@gmail.com>
 License: Apache-2.0

{msreport-0.0.25.dist-info → msreport-0.0.26.dist-info}/RECORD

@@ -1,4 +1,4 @@
-msreport/__init__.py,sha256=jjDMik2PPl545bNn3KEyaYcq5KZ1ya8B95hmONuW47o,343
+msreport/__init__.py,sha256=plg-xX45MtHFaMW2qKkNZMTku2gH1Eu5iY4mmFdYSa8,343
 msreport/analyze.py,sha256=JBLuFLYJjI-8NIIwzq2gEJKJYFmKyuLUwf8NgSzC9_c,25350
 msreport/errors.py,sha256=qJan3lzRX6uwnByg9LfAfGKEKC2tm9SYUBvk3TdH_AM,300
 msreport/export.py,sha256=pyB8D1VjvfJWO6ka6uMnHsbc6SRlmCyhUB2sfBlhYDQ,20095
@@ -17,14 +17,14 @@ msreport/aggregate/summarize.py,sha256=aI0YP9Kg4ZTVjS6c9gzu3xqvLOTsYJ5ZT3FcUJyg1
 msreport/helper/__init__.py,sha256=8B7gdXn5tFeZATBF30TMaWu0ppc7xFa72JLxMYt_qUM,535
 msreport/helper/calc.py,sha256=ReMP1jA7bz-a7J1DdlAVATN9zjSXENqbw652WfjSEkY,4088
 msreport/helper/maxlfq.py,sha256=DE9yX4vjMRSmolffrpC9UkCXmSs-rCN15cnlNzma4zw,14938
-msreport/helper/table.py,sha256=xAp1me8c6bllfLk27JCl2mFq6fL7jAe4Ic8Gw2yNhf4,11037
+msreport/helper/table.py,sha256=N-veDU3vQ2NeOfKcxUop5SfCv2iW038akkSKxU2yjzg,11464
 msreport/helper/temp.py,sha256=jNulgDATf9sKXEFWMXAhjflciOZPAqlxg_7QZS7IkW8,3736
 msreport/rinterface/__init__.py,sha256=Z1I-4buERXTPIZmhdaTKZWfbJv_qVcqnUVqIJZx1Du8,146
 msreport/rinterface/limma.py,sha256=ATtsVyGSnqUGkyodQTgdpIFhEb4dJZ6wvSjrRsCrNRY,5421
 msreport/rinterface/rinstaller.py,sha256=sm6CJD0-XSxdDpUnL9EAI_CAIgo1NucYxPI9gL93zqw,1377
 msreport/rinterface/rscripts/limma.R,sha256=gr_yjMm_YoG45irDhWOo6gkRQSTwj_7uU_p3NBRHPm8,4331
-msreport-0.0.25.dist-info/licenses/LICENSE.txt,sha256=Pd-b5cKP4n2tFDpdx27qJSIq0d1ok0oEcGTlbtL6QMU,11560
-msreport-0.0.25.dist-info/METADATA,sha256=Cg9LGgMSLbJR-q0Lfm6AM_Jk5GZ-KRiE1Vk8j47tTb8,5339
-msreport-0.0.25.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-msreport-0.0.25.dist-info/top_level.txt,sha256=Drl8mCckJHFIw-Ovh5AnyjKnqvLJltDOBUr1JAcHAlI,9
-msreport-0.0.25.dist-info/RECORD,,
+msreport-0.0.26.dist-info/licenses/LICENSE.txt,sha256=Pd-b5cKP4n2tFDpdx27qJSIq0d1ok0oEcGTlbtL6QMU,11560
+msreport-0.0.26.dist-info/METADATA,sha256=0OpBlUdIaAqhdzEK9Mkq12rVJpeJHuYflFI4griTxqE,5339
+msreport-0.0.26.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
+msreport-0.0.26.dist-info/top_level.txt,sha256=Drl8mCckJHFIw-Ovh5AnyjKnqvLJltDOBUr1JAcHAlI,9
+msreport-0.0.26.dist-info/RECORD,,