dealing with errors from updated software version

KatyBrown · May 13, 2024 · 9ee480c · 9ee480c
1 parent fadba67
commit 9ee480c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 psutil>=5.8.0
-matplotlib==3.3.4
+matplotlib>=3.3.4
 numpy>=1.19
 scikit_image>=0.19.2
 pandas>=0.25.3

diff --git a/tests/pwmTest.py b/tests/pwmTest.py
@@ -38,6 +38,9 @@ def setUp(self):
                                   sep="\t", header=None, index_col=0)
                 tab.columns = pd.RangeIndex(np.shape(tab)[1])
                 self.matrices[mat][string] = tab
+                if mat == 'pfm':
+                    self.matrices[mat][string] = self.matrices[
+                        mat][string].astype(np.int64)
 
             for stat in ['alpha', 'freq']:
                 self.matrices[stat][string] = np.load(
@@ -73,6 +76,7 @@ def testgetCoreRes(self, typ, expected):
     def testmakePFM(self, typ, subtyp):
         arr = self.arrs[subtyp]
         PFM, RNA = matrices.makePFM(arr, typ)
+        PFM.dtype = np.int64
         pandas.testing.assert_frame_equal(PFM, self.matrices['pfm'][subtyp],
                                           check_names=False)
 
@@ -84,6 +88,7 @@ def testmakePPM(self, typ, subtyp, RNA):
         PFM = self.matrices['pfm'][subtyp]
         alpha = self.matrices['alpha'][subtyp]
         PPM = matrices.makePPM(PFM, alpha).round(3)
+        PPM.dtype = np.int64
         pandas.testing.assert_frame_equal(PPM, self.matrices['ppm'][subtyp])
 
 
@@ -94,6 +99,7 @@ def testmakePWM(self, typ, subtyp, RNA):
         PPM = self.matrices['ppm'][subtyp]
         freq = self.matrices['freq'][subtyp]
         PWM = matrices.makePWM(PPM, freq)
+        PWM.dtype = np.int64
         pandas.testing.assert_frame_equal(PWM, self.matrices['pwm'][subtyp])
 
 
@@ -116,7 +122,7 @@ def testmakePWM(self, typ, subtyp, RNA):
                            ['xxx', 'nt', 'dna', True, np.zeros((1, 1))]])
     def testgetFreq(self, freqtype, typ, subtyp, RNA, expected):
         logger = logging.getLogger('path.to.module.under.test')
-        PFM = self.matrices['pfm'][subtyp]
+        PFM = self.matrices['pfm'][subtyp].astype(np.int64)
         if freqtype == 'calc2':
             PFM2 = self.matrices['pfm']['dna_large']
         else: