Win32 merge

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

@@ -1,7 +1,7 @@
 name: pyDevSup
 
 # Trigger on pushes and PRs to any branch
-on: [push, pull_request]
+on: [push, pull_request, workflow_dispatch]
 
 env:
     SETUP_PATH: .ci-local:.ci
@@ -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 }}
@@ -31,24 +32,51 @@ jobs:
             cmp: gcc
             configuration: default
             base: "7.0"
-            python: "2.7"
-            profile: deb8
+            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: "2.7"
-            profile: deb8
+            python: "3.6"
+            container: "python:3.6"
+            profile: latest
             test: yes
 
           - os: ubuntu-latest
             cmp: gcc
             configuration: default
             base: "7.0"
             python: "3.7"
-            profile: deb10
+            container: "python:3.7"
+            profile: latest
             test: yes
 
           - os: ubuntu-latest
@@ -75,17 +103,33 @@ jobs:
             profile: latest
             test: yes
 
-          - os: macos-latest
+          - os: ubuntu-latest
             cmp: gcc
             configuration: default
             base: "7.0"
-            python: "3.10"
+            python: "3.11"
             profile: latest
             test: yes
 
-          - os: windows-latest
-            cmp: vs2019
-            configuration: debug
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+            python: "3.12"
+            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
             base: "7.0"
             python: "3.10"
             profile: latest
@@ -95,22 +139,66 @@ jobs:
             cmp: gcc
             configuration: default
             base: "3.15"
-            python: "2.7"
-            profile: deb8
+            python: "3.7"
+            container: "python:3.7"
+            profile: deb10
             test: yes
 
           - os: ubuntu-latest
             cmp: gcc
             configuration: default
-            base: "3.14"
-            python: "2.7"
-            profile: deb8
+            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
+            base: "7.0"
+            python: "3.11"
+            profile: latest
+            test: yes
+
+          - os: windows-latest
+            cmp: vs2022
+            configuration: default
+            base: "7.0"
+            python: "3.12"
+            profile: latest
+            test: yes
+
+          - os: windows-latest
+            cmp: vs2022
+            configuration: default
+            base: "7.0"
+            python: "3.13"
+            profile: latest
+            test: yes
 
     steps:
     - uses: actions/checkout@v3
       with:
         submodules: true
     - name: Set up Python ${{ matrix.python }}
+      if: ${{ !matrix.container }}
       uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python }}
@@ -125,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

README.md

@@ -3,6 +3,6 @@ pyDevSup
 
 EPICS Device support in Python.
 
-See [documentation](http://mdavidsaver.github.io/pyDevSup)
+See [documentation](http://epics-modules.github.io/pyDevSup)
 
-For file [releases](https://github.com/mdavidsaver/pyDevSup/releases)
+For file [releases](https://github.com/epics-modules/pyDevSup/releases)

configure/CONFIG_PY

@@ -48,6 +48,10 @@ LOADABLE_SHRLIB_LDFLAGS = -bundle -flat_namespace -undefined dynamic_lookup
 LOADABLE_SHRLIB_SUFFIX = .so
 endif
 
+ifeq ($(OS_CLASS),WIN32)
+SHRLIB_SUFFIX_BASE = .pyd
+endif
+
 endif
 
 endif

configure/RULES_PY

@@ -1,15 +1,15 @@
 ifneq ($(T_A),)
-
 ifndef PY_VER
 $(error Must include CONFIG_PY)
 endif
 
+include $(CONFIG)/CONFIG_BASE
+
 PY_FILES += $(PY:%=$(PY_INSTALL_DIR)/%)
 
 $(PY_FILES) : $(PY_INSTALL_DIR)/%: ../%
-	@[ -d $(dir $@) ] || install -d $(dir $@)
-	@echo "Install PY $@"
-	install -m 644 $< $@
+	$(ECHO) "Install PY $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 build: $(PY_FILES)
 

devsupApp/src/Makefile

@@ -29,10 +29,13 @@ _dbapi_SRCS += utest.c
 _dbapi_SRCS += pyDevSupCommon_registerRecordDeviceDriver.cpp
 
 _dbapi_LIBS += $(EPICS_BASE_IOC_LIBS)
-_dbapi_SYS_LIBS_WIN32 += python$(PY_LD_VER)
+_dbapi_LDFLAGS_WIN32 += $(PY_LDLIBS)
 _dbapi_SYS_LIBS_WIN32 += ws2_32 Advapi32 Dbghelp
 
 PY += devsup/__init__.py
+PY += devsup/_dbapi.dbd
+PY += devsup/_int64.dbd
+PY += devsup/_lsilso.dbd
 PY += devsup/db.py
 PY += devsup/dset.py
 PY += devsup/hooks.py
@@ -63,7 +66,11 @@ pyconfig:
 
 ifneq (,$(T_A))
 nose:
+ifeq ($(OS),Windows_NT)
+	pushd "$(abspath $(TOP))/python$(PY_LD_VER)/$(EPICS_HOST_ARCH)" && $(PYTHON) -m nose2 -v devsup $(NOSEFLAGS) && popd
+else
 	PYTHONPATH="${PYTHONPATH}:$(abspath $(TOP))/python$(PY_LD_VER)/$(EPICS_HOST_ARCH)" $(PYTHON) -m nose2 -v devsup $(NOSEFLAGS)
+endif
 
 # bounce back down to the sphinx generated Makefile
 # aren't Makefiles fun...

devsupApp/src/dbfield.c

@@ -40,6 +40,10 @@ static const int dbf2np_map[DBF_MENU+1] = {
     NPY_INT16,   // DBF_MENU
 };
 static PyArray_Descr* dbf2np[DBF_MENU+1];
+#if NPY_ABI_VERSION < 0x02000000
+  #define PyDataType_ELSIZE(descr) ((descr)->elsize)
+  #define PyDataType_SET_ELSIZE(descr, size) (descr)->elsize = size
+#endif
 #endif
 
 typedef struct {
@@ -98,7 +102,7 @@ static PyObject* build_array(PyObject* obj, void *data, unsigned short ftype, un
 
     desc = dbf2np[ftype];
     if(ftype==DBF_STRING) {
-        desc->elsize = MAX_STRING_SIZE;
+    PyDataType_SET_ELSIZE(desc, MAX_STRING_SIZE);
     }
 
     Py_XINCREF(desc);
@@ -114,23 +118,26 @@ 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) > (npy_intp) 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)) &&
@@ -152,7 +159,7 @@ static int assign_array(DBADDR *paddr, PyObject *arr)
     }
 
     Py_XINCREF(desc);
-    if(!(aval = PyArray_FromAny(arr, desc, 1, 2, NPY_CARRAY, arr)))
+    if(!(aval = PyArray_FromAny(arr, desc, 1, 2, NPY_ARRAY_C_CONTIGUOUS | NPY_ARRAY_ALIGNED | NPY_ARRAY_WRITEABLE, arr)))
         return 1;
 
     if(elemsize!=PyArray_ITEMSIZE(aval)) {
@@ -207,7 +214,7 @@ static PyObject* pyField_getval(pyField *self)
 
         if(self->addr.no_elements>1) {
             return build_array((PyObject*)self, rawfield, self->addr.field_type,
-                               noe, NPY_CARRAY_RO);
+                               noe, NPY_ARRAY_C_CONTIGUOUS | NPY_ARRAY_ALIGNED);
         }
     }
 
@@ -296,8 +303,8 @@ static PyObject* pyField_putval(pyField *self, PyObject* args)
     OP(LONG,  epicsInt32,  PyInt_AsLong);
     OP(ULONG, epicsUInt32, PyInt_AsLong);
 #ifdef HAVE_INT64
-    OP(INT64,  epicsInt32,  PyLong_AsLongLong);
-    OP(UINT64, epicsUInt32, PyLong_AsLongLong);
+    OP(INT64,  epicsInt64,  PyLong_AsLongLong);
+    OP(UINT64, epicsUInt64, PyLong_AsLongLong);
 #endif
     OP(FLOAT, epicsFloat32,PyFloat_AsDouble);
     OP(DOUBLE,epicsFloat64,PyFloat_AsDouble);
@@ -314,11 +321,14 @@ static PyObject* pyField_putval(pyField *self, PyObject* args)
         fld = PyString_AsString(val);
 #endif
         if(fld) {
-          strncpy(dest, fld, MAX_STRING_SIZE);
-          dest[MAX_STRING_SIZE-1]='\0';
+          strncpy(dest, fld, self->addr.field_size);
+          dest[self->addr.field_size-1]='\0';
         } else {
           dest[0] = '\0';
         }
+        if ((self->addr.special == SPC_MOD) || (self->addr.special == SPC_NOMOD))
+            if (prset = dbGetRset(&self->addr))
+                prset->special(&self->addr, 1);
 #if PY_MAJOR_VERSION >= 3
         Py_DECREF(data);
 #endif
@@ -362,7 +372,7 @@ static PyObject *pyField_getarray(pyField *self)
     } else
         data = self->addr.pfield;
 
-    return build_array((PyObject*)self, data, self->addr.field_type, self->addr.no_elements, NPY_CARRAY);
+    return build_array((PyObject*)self, data, self->addr.field_type, self->addr.no_elements, NPY_ARRAY_C_CONTIGUOUS | NPY_ARRAY_ALIGNED | NPY_ARRAY_WRITEABLE);
 }
 
 static PyObject *pyField_getlen(pyField *self)