Merge pull request #82 from AlexandrovLab/w1

Resolve issue with sample reconstruction plots and pandas version

Author: mdbarnesUCSD

SigProfilerAssignment/decomposition.py

@@ -58,7 +58,7 @@ def generate_sample_reconstruction(cosmic_sigs, samples_input, activities, outpu
     samples.reset_index(inplace=True)
     for sample_name in samples.columns[1:]:
         # basis names and their corresponding weights
-        subset = activities[activities["Samples"].str.contains(sample_name)]
+        subset = activities[activities["Samples"] == sample_name]
         subset = subset.loc[:, (subset != 0).any(axis=0)]
         basis_names = subset[subset["Samples"].str.contains(sample_name)].columns[1:].tolist()
         recon_tmb = subset.sum(axis=1)

setup.py

@@ -6,7 +6,7 @@
 if os.path.exists("dist"):
     shutil.rmtree("dist")
 
-VERSION = '0.0.29'
+VERSION = '0.0.30'
 
 
 def write_version_py(filename='SigProfilerAssignment/version.py'):
@@ -15,7 +15,7 @@ def write_version_py(filename='SigProfilerAssignment/version.py'):
 # THIS FILE IS GENERATED FROM SigProfilerAssignment SETUP.PY
 short_version = '%(version)s'
 version = '%(version)s'
-Update = 'v0.0.29: Stop decomposition plotting with custom signature database and update parameters for sample reconstruction plots'
+Update = 'v0.0.30: Sample reconstruction plot fix and pandas version fix.'
 
     
     """
@@ -29,7 +29,7 @@ def write_version_py(filename='SigProfilerAssignment/version.py'):
 requirements=[
           'scipy>=1.6.3',
           'numpy>=1.21.2',
-          'pandas>=1.2.4',
+          'pandas>=1.2.4,<2.0.0',
           'SigProfilerMatrixGenerator>=1.2.14', 
           'sigProfilerPlotting>=1.3.11',
           'statsmodels>=0.9.0',