Merge pull request #71 from casper-astro/py38-dev

Py38 dev

Author: jkocz

.github/workflows/run_test.yaml

@@ -7,7 +7,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy: 
             matrix:
-                python-version: ["3.8.3"]
+                python-version: ["3.8"]
 
         steps:
             - uses: actions/checkout@v3

setup.py

@@ -54,7 +54,7 @@
         'IPython',
         'future',
         'numpy',
-        'katcp==0.9.1',
+        'katcp==0.9.3',
         'katversion',
         'odict',
         'setuptools',

src/casperfpga.py

@@ -4,7 +4,7 @@
 import socket
 from time import strptime
 import string
-import collections
+from collections.abc import Callable
 
 from . import register
 from . import sbram
@@ -625,7 +625,7 @@ def _create_memory_devices(self, device_dict, memorymap_dict, legacy_reg_map=Tru
             except KeyError:
                 pass
             else:
-                if not isinstance(known_device_class, collections.Callable):
+                if not isinstance(known_device_class, Callable):
                     raise TypeError('%s is not a callable Memory class - '
                                     'that\'s a problem.' % known_device_class)
 
@@ -692,7 +692,7 @@ def _create_casper_adc_devices(self, device_dict, initialise=False, **kwargs):
             except KeyError:
                 pass
             else:
-                if not isinstance(known_device_class, collections.Callable):
+                if not isinstance(known_device_class, Callable):
                     errmsg = '{} is not a callable ADC Class'.format(known_device_class)
                     raise TypeError(errmsg)