Do code review and CI fixes

We don't need the newest version of epicscorelibs.
Fix attempting to use cothread on Windows.
Import registerAllRecordDeviceDrivers ourselves so we can do error
checking the same way as other functions, without relying on
epicscorelibs or needing additional error handling

Author: AlexanderWells-diamond

Pipfile.lock

@@ -1,3 +1,3 @@
 [build-system]
-requires = ["setuptools", "wheel", "setuptools_dso>=2.1", "epicscorelibs>=7.0.7.99.1.2a1"]
+requires = ["setuptools", "wheel", "setuptools_dso>=2.1", "epicscorelibs>=7.0.7.99.1.1a3"]
 build-backend = "setuptools.build_meta:__legacy__"

pyproject.toml

@@ -1,12 +1,8 @@
 '''Python soft IOC module.'''
 import os
-import ctypes
 
-from setuptools_dso.runtime import find_dso
 import epicscorelibs.path
-import pvxslibs.path
-from epicscorelibs.ioc import \
-    iocshRegisterCommon, registerRecordDeviceDriver, pdbbase
+from epicscorelibs.ioc import iocshRegisterCommon, pdbbase
 
 # Do this as early as possible, in case we happen to use cothread
 # This will set the CATOOLS_LIBCA_PATH environment variable in case we use
@@ -15,7 +11,7 @@
 
 # This import will also pull in the extension, which is needed
 # before we call iocshRegisterCommon
-from .imports import dbLoadDatabase
+from .imports import dbLoadDatabase, registerRecordDeviceDriver
 from ._version_git import __version__
 
 # Need to do this before calling anything in device.py
@@ -25,7 +21,6 @@
 iocStats = os.path.join(os.path.dirname(__file__), "iocStats", "devIocStats")
 dbLoadDatabase('devIocStats.dbd', iocStats, None)
 
-if registerRecordDeviceDriver(pdbbase):
-    raise RuntimeError('Error registering')
+registerRecordDeviceDriver(pdbbase)
 
 __all__ = ['__version__']

softioc/__init__.py

@@ -105,6 +105,9 @@ def from_param(cls, value):
 epicsExitCallAtExits.argtypes = ()
 epicsExitCallAtExits.restype = None
 
+registerRecordDeviceDriver = dbCore.registerAllRecordDeviceDrivers
+registerRecordDeviceDriver.argtypes = (c_void_p,)
+registerRecordDeviceDriver.errcheck = expect_success
 
 __all__ = [
     'get_field_offsets',

softioc/imports.py

@@ -6,7 +6,7 @@
 from tempfile import NamedTemporaryFile
 
 import pvxslibs.path
-from epicscorelibs.ioc import registerRecordDeviceDriver, pdbbase
+from epicscorelibs.ioc import pdbbase
 from setuptools_dso.runtime import find_dso
 
 from . import autosave, imports, device
@@ -44,8 +44,7 @@ def iocInit(dispatcher=None, enable_pva=True):
         dbLoadDatabase('pvxsIoc.dbd', pvxslibs.path.dbd_path, None)
         ctypes.CDLL(find_dso('pvxslibs.lib.pvxsIoc'), ctypes.RTLD_GLOBAL)
 
-        if registerRecordDeviceDriver(pdbbase):
-            raise RuntimeError('Error registering')
+        imports.registerRecordDeviceDriver(pdbbase)
 
     imports.iocInit()
     autosave.start_autosave_thread()

softioc/softioc.py

@@ -12,7 +12,7 @@
     get_multiprocessing_context,
 )
 
-from softioc import builder, softioc
+from softioc import asyncio_dispatcher, builder, softioc
 
 
 class TestPVAccess:
@@ -26,8 +26,9 @@ def pva_test_func(self, device_name, conn, use_pva):
 
         builder.aOut(self.record_name, initial_value=self.record_value)
 
+        dispatcher = asyncio_dispatcher.AsyncioDispatcher()
         builder.LoadDatabase()
-        softioc.iocInit(enable_pva=use_pva)
+        softioc.iocInit(dispatcher=dispatcher, enable_pva=use_pva)
 
         conn.send("R")  # "Ready"
         log("CHILD: Sent R over Connection to Parent")