Tested Windows (and Linux) builds with Base 3.15.

Excluded int64 and long string for that reason.
Base 3.14 doesn't work because RuntimeError: Requires Base >=3.15.

Author: Peter Heesterman

.github/workflows/ci-scripts-build.yml

@@ -11,8 +11,9 @@ env:
 
 jobs:
   build-base:
-    name: ${{ matrix.base }}/${{ matrix.os }}/${{ matrix.python }}/${{ matrix.extra }}
+    name: ${{ matrix.base }}/${{ matrix.os }}/${{ matrix.profile }}/${{ matrix.python }}/${{ matrix.extra }}
     runs-on: ${{ matrix.os }}
+    container: ${{ matrix.container }}
     # Set environment variables from matrix parameters
     env:
       CMP: ${{ matrix.cmp }}
@@ -27,6 +28,57 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+            python: "3.7"
+            profile: deb10
+            container: "python:3.7"
+            test: yes
+
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+            python: "3.9"
+            profile: deb11
+            test: yes
+
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+            python: "3.11"
+            profile: deb12
+            test: yes
+
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+            python: "3.13"
+            profile: deb13
+            test: yes
+
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+            python: "3.6"
+            container: "python:3.6"
+            profile: latest
+            test: yes
+
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+            python: "3.7"
+            container: "python:3.7"
+            profile: latest
+            test: yes
+
           - os: ubuntu-latest
             cmp: gcc
             configuration: default
@@ -51,6 +103,14 @@ jobs:
             profile: latest
             test: yes
 
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+            python: "3.11"
+            profile: latest
+            test: yes
+
           - os: ubuntu-latest
             cmp: gcc
             configuration: default
@@ -59,6 +119,14 @@ jobs:
             profile: latest
             test: yes
 
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+            python: "3.13"
+            profile: latest
+            test: yes
+
           - os: macos-latest
             cmp: gcc
             configuration: default
@@ -67,6 +135,40 @@ jobs:
             profile: latest
             test: yes
 
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            base: "3.15"
+            python: "3.7"
+            container: "python:3.7"
+            profile: deb10
+            test: yes
+
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            base: "3.15"
+            python: "3.13"
+            profile: deb13
+            test: yes
+
+          #- os: ubuntu-latest
+          #  cmp: gcc
+          #  configuration: default
+          #  base: "3.14" # RuntimeError: Requires Base >=3.15 ??
+          #  python: "3.7"
+          #  container: "python:3.7"
+          #  profile: deb10
+          #  test: yes
+
+          - os: windows-latest
+            cmp: vs2022
+            configuration: default
+            base: "3.15"
+            python: "3.11"
+            profile: latest
+            test: yes
+
           - os: windows-latest
             cmp: vs2022
             configuration: default
@@ -96,6 +198,7 @@ jobs:
       with:
         submodules: true
     - name: Set up Python ${{ matrix.python }}
+      if: ${{ !matrix.container }}
       uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python }}
@@ -110,13 +213,8 @@ jobs:
         EOF
         echo === configure/CONFIG_SITE.local ===
         cat configure/CONFIG_SITE.local
-    - name: makehelper.py
-      run: python makehelper.py
-    - name: DSOs
-      shell: bash
-      run: find ${Python_ROOT_DIR} -name '*.dll' -o -name '*.so' -o -name '*.dylib'
-    - name: get_config_vars
-      run: python -c 'from sysconfig import get_config_vars; from pprint import pprint; pprint(get_config_vars())'
+    - name: Python sysconfig
+      run: python -m sysconfig
     - name: Prepare and compile dependencies
       run: python .ci/cue.py prepare
     - name: Build main module

devsupApp/src/dbfield.c

@@ -3,16 +3,9 @@
 #undef _POSIX_C_SOURCE
 #undef _XOPEN_SOURCE
 
-#ifdef _DEBUG
-#undef _DEBUG
 #include <Python.h>
 #ifdef HAVE_NUMPY
-#include <numpy/ndarrayobject.h>
-#endif
-#define _DEBUG
-#else
-#include <Python.h>
-#include <numpy/ndarrayobject.h>
+#include <_numpy/ndarrayobject.h>
 #endif
 
 #include <epicsVersion.h>
@@ -29,6 +22,11 @@
 #endif
 
 #ifdef HAVE_NUMPY
+/* See https://numpy.org/devdocs/reference/c-api/array.html */
+/* Allow compiling on NumPy 1.x */
+#if NPY_ABI_VERSION < 0x02000000
+#define PyArray_DescrProto PyArray_Descr
+#endif
 static const int dbf2np_map[DBF_MENU+1] = {
     NPY_STRING,  // DBF_STRING
     NPY_BYTE,    // DBF_CHAR
@@ -46,7 +44,7 @@ static const int dbf2np_map[DBF_MENU+1] = {
     NPY_INT16,   // DBF_ENUM
     NPY_INT16,   // DBF_MENU
 };
-static PyArray_Descr* dbf2np[DBF_MENU+1];
+static PyArray_DescrProto* dbf2np[DBF_MENU+1];
 #endif
 
 typedef struct {
@@ -126,23 +124,24 @@ static int assign_array(DBADDR *paddr, PyObject *arr)
 #ifdef HAVE_NUMPY
     void *rawfield = paddr->pfield;
     rset *prset;
-    PyObject *aval;
+    PyArrayObject *aval;
+    PyArrayObject * array = (PyArrayObject *)arr;
     unsigned elemsize = dbValueSize(paddr->field_type);
     unsigned long maxlen = paddr->no_elements, insize;
     PyArray_Descr *desc = dbf2np[paddr->field_type];
 
     if(paddr->field_type==DBF_STRING &&
-        (PyArray_NDIM(arr)!=2 || PyArray_DIM(arr,0)>maxlen || PyArray_DIM(arr,1)!=MAX_STRING_SIZE))
+        (PyArray_NDIM(array)!=2 || PyArray_DIM(array,0)>maxlen || PyArray_DIM(array,1)!=MAX_STRING_SIZE))
     {
         PyErr_Format(PyExc_ValueError, "String array has incorrect shape or is too large");
         return 1;
 
-    } else if(PyArray_NDIM(arr)!=1 || PyArray_DIM(arr,0)>maxlen) {
+    } else if(PyArray_NDIM(array)!=1 || PyArray_DIM(array,0)>maxlen) {
         PyErr_Format(PyExc_ValueError, "Array has incorrect shape or is too large");
         return 1;
     }
 
-    insize = PyArray_DIM(arr, 0);
+    insize = PyArray_DIM(array, 0);
 
     if(paddr->special==SPC_DBADDR &&
        (prset=dbGetRset(paddr)) &&

devsupApp/src/devsup/__init__.py

@@ -58,6 +58,9 @@
 __all__ = []
 
 
+def epics_version_int():
+    return (EPICS_VERSION, EPICS_REVISION, EPICS_MODIFICATION, EPICS_PATCH_LEVEL)
+
 def _init(iocMain=False):
     if not iocMain:
         # we haven't read/register base.dbd
@@ -68,11 +71,12 @@ def _init(iocMain=False):
     dirname = os.path.dirname(__file__)
     dbd_name = dirname + "/_dbapi.dbd"
     _dbapi.dbReadDatabase(dbd_name)
-    epics_version_int = (EPICS_VERSION, EPICS_REVISION, EPICS_MODIFICATION, EPICS_PATCH_LEVEL)
-    if epics_version_int >= (3, 15, 0, 2):
+    if epics_version_int() >= (3, 15, 0, 2):
+        # Long strings are impletemented.
         dbd_name = dirname + "/_lsilso.dbd"
         _dbapi.dbReadDatabase(dbd_name)
-    if epics_version_int >= (3, 16, 1, 0):
+    if epics_version_int() >= (3, 16, 1, 0):
+        # Long ints are impletemented.
         dbd_name = dirname + "/_int64.dbd"
         _dbapi.dbReadDatabase(dbd_name)
     _dbapi._dbd_setup()

devsupApp/src/devsup/test/test_db.py

@@ -9,7 +9,7 @@
 
 from ..db import getRecord
 from .. import _dbapi
-from .. import _init
+from .. import _init, epics_version_int
 
 from .util import IOCHelper
 
@@ -142,8 +142,15 @@ class TestLongStringField(IOCHelper):
             field(OMSL,  "closed_loop")
         }
     """
+    if epics_version_int() < (3, 15, 0, 2):
+        # Long strings not impletemented yet.
+        db = None
 
     def test_lsilso(self):
+        if epics_version_int() < (3, 15, 0, 2):
+            # Long strings not impletemented yet.
+            return
+ 
         lsi = getRecord("rec:lsi")
         lso = getRecord("rec:lso")
 
@@ -176,8 +183,14 @@ class TestInt64Field(IOCHelper):
             field(OMSL,  "closed_loop")
         }
     """
+    if epics_version_int() < (3, 16, 1, 0):
+        # Long ints not impletemented yet.
+        db = None
 
     def testint64(self):
+        if epics_version_int() < (3, 16, 1, 0):
+            # Long ints not impletemented yet.
+            return
         in64 = getRecord("rec:in64")
         out64 = getRecord("rec:out64")
 

makehelper.py

@@ -53,7 +53,7 @@
 print('PY_INCDIRS :=',' '.join(incdirs), file=out)
 print('PY_LIBDIRS :=',libdir, file=out)
 if sys.platform == 'win32':
-    print('PY_LDLIBS :=', '/LIBPATH:' + os.path.join(sys.prefix, 'libs'), file=out)
+    print('PY_LDLIBS :=', '-LIBPATH:' + os.path.join(sys.prefix, 'libs'), file=out)
 print('HAVE_NUMPY :=',have_np, file=out)
 
 try:

pyIocApp/devsupMain.cpp

@@ -205,7 +205,7 @@ int main(int argc, char *argv[])
 	iocsh(NULL);
     } else {
 	if (loadedDb) {
-	    //epicsThreadExitMain();
+	    epicsThreadExitMain();
 	} else {
 	    printf("%s: Nothing to do!\n", arg0);
 	    usage(EXIT_FAILURE);

pyIocApp/setup.c

@@ -24,7 +24,6 @@
 
 #include "pydevsup.h"
 #ifdef _WIN32
-#include <stdlib.h>
 #define PATH_MAX _MAX_PATH
 #endif
 
@@ -134,7 +133,10 @@ static void cleanupPrep(initHookState state)
 static void pySetupReg(void)
 {
     Py_InitializeEx(0);
+#if NPY_TARGET_VERSION < NPY_1_9_API_VERSION
+    /* See https://docs.python.org/3/whatsnew/3.9.html */
     PyEval_InitThreads();
+#endif
 
     setupPyPath();