Merge pull request #2 from BerkeleyLab/numpy_update

Numpy compatibility updates to raw.py

Author: lerwys

leep/raw.py

@@ -309,6 +309,7 @@ def wait_for_acq(self, tag=False, toggle_tag=False, timeout=5.0,
 
         if self.rfs:
             T, = self.reg_read(['dsp_tag'], instance=instance)
+            T = int(T)
             if tag or toggle_tag:
                 T = (T + 1) & 0xff
                 self.reg_write([('dsp_tag', T)], instance=instance)
@@ -350,8 +351,8 @@ def wait_for_acq(self, tag=False, toggle_tag=False, timeout=5.0,
 
             if self.rfs:
                 slow, = self.reg_read(['slow_data'], instance=instance)
-                tag_old = slow[34]
-                tag_new = slow[33]
+                tag_old = int(slow[34])
+                tag_new = int(slow[33])
                 dT = (tag_old - T) & 0xff
                 tag_match = dT == 0 and tag_new == tag_old
 

leep/test/test_cli.py

@@ -293,12 +293,12 @@ def test_parseTransaction():
     for _input in bads:
         try:
             result = parseTransaction(_input)
-            print(f"Expected an exception for input: { _input } but got {result}")
+            print(f"Expected an exception for input: {_input} but got {result}")
             errors += 1
         except ValueError:
             pass
         except Exception as ex:
-            print(f"Unexpected exception for input: { _input }: { ex }")
+            print(f"Unexpected exception for input: {_input}: {ex}")
             errors += 1
     return errors