Merge branch 'master' into new_handler_methods

Monarda · Monarda · commit 687a21b60360 · 2025-05-27T22:05:59.000+01:00
diff --git a/.ci/build-deps.sh b/.ci/build-deps.sh
@@ -33,7 +33,7 @@ fi
 
 if [ "$BRPVXS" ]
 then
-    git clone --quiet --recursive --depth 5 --branch "$BRPVXS" https://github.com/mdavidsaver/pvxs.git pvxs
+    git clone --quiet --recursive --depth 5 --branch "$BRPVXS" https://github.com/epics-base/pvxs.git pvxs
     (cd pvxs && git log -n1 )
     cat << EOF >> $CURDIR/configure/RELEASE.local
 PVXS=$HOME/.source/pvxs
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -43,10 +43,11 @@ jobs:
           # Check build from .tar
           - name: Source
             os: ubuntu-latest
-            python: "3.9"
+            python: "3.12"
             source: true
 
           # Linux py builds x64
+          # TODO: manylinux1 and 2014 are EOL, even more reason to remove these supported versions
           - name: linux 2.7 amd64
             os: ubuntu-latest
             pyver: cp27-cp27m
@@ -109,9 +110,17 @@ jobs:
             piparch: manylinux2014_x86_64
             numpy: numpy==1.23.5
             cython: Cython==0.29.35
+
+          - name: linux 3.12 amd64
+            os: ubuntu-latest
+            pyver: cp312-cp312
+            piparch: manylinux2014_x86_64
+            numpy: numpy==2.0.1
+            cython: Cython==3.0.10
             skip_cothread: yes
 
           # Linux py builds x64
+          # TODO: manylinux1 and 2014 are EOL, even more reason to remove these supported versions
           - name: linux 2.7 i686
             os: ubuntu-latest
             pyver: cp27-cp27m
@@ -151,74 +160,88 @@ jobs:
             numpy: numpy==1.16.2
             cython: Cython==0.29.2
             pre: linux32
+            skip_cothread: yes
 
           - name: linux 3.8 i686
             os: ubuntu-latest
             pyver: cp38-cp38
             piparch: manylinux1_i686
-            numpy: numpy==1.17.3
+            numpy: numpy==1.19.5
             cython: Cython==0.29.2
             pre: linux32
+            skip_cothread: yes
 
           - name: linux 3.9 i686
             os: ubuntu-latest
             pyver: cp39-cp39
             piparch: manylinux2010_i686
-            numpy: numpy==1.19.3
+            numpy: numpy==1.19.5
             cython: Cython==0.29.23
             pre: linux32
+            skip_cothread: yes
 
           # numpy i386 wheels not built >= 3.10
 
           # OSX py builds
           - name: osx 3.6 intel
-            os: macos-latest
+            os: macos-13
             python: "3.6"
             piparch: macosx_10_9_intel
             numpy: numpy==1.11.3
             cython: Cython==0.29.2
 
           - name: osx 3.7 intel
-            os: macos-latest
+            os: macos-13
             python: "3.7"
             piparch: macosx_10_9_intel
             numpy: numpy==1.16.2
             cython: Cython==0.29.2
 
-          - name: osx 3.8 intel
+          - name: osx 3.8 arm64
             os: macos-latest
             python: "3.8"
-            piparch: macosx_10_9_intel
-            numpy: numpy==1.17.3
+            piparch: macosx_11_0_universal2
+            numpy: numpy==1.24.4
             cython: Cython==0.29.2
+            skip_cothread: yes
 
-          - name: osx 3.9 intel
+          - name: osx 3.9 arm64
             os: macos-latest
             python: "3.9"
-            piparch: macosx_10_9_intel
-            numpy: numpy==1.19.3
-            cython: Cython==0.29.23
+            piparch: macosx_11_0_universal2
+            numpy: numpy==2.0.1
+            cython: Cython==3.0.10
+            skip_cothread: yes
 
-          - name: osx 3.10 intel
+          - name: osx 3.10 arm64
             os: macos-latest
             python: "3.10"
-            piparch: macosx_10_9_intel
-            numpy: numpy==1.22.0
-            cython: Cython==0.29.23
+            piparch: macosx_11_0_universal2
+            numpy: numpy==2.0.1
+            cython: Cython==3.0.10
+            skip_cothread: yes
 
-          - name: osx 3.11 intel
+          - name: osx 3.11 arm64
             os: macos-latest
             python: "3.11"
-            piparch: macosx_10_9_intel
-            numpy: numpy==1.23.5
-            cython: Cython==0.29.35
+            piparch: macosx_11_0_universal2
+            numpy: numpy==2.0.1
+            cython: Cython==3.0.10
+            skip_cothread: yes
+
+          - name: osx 3.12 arm64
+            os: macos-latest
+            python: "3.12"
+            piparch: macosx_11_0_universal2
+            numpy: numpy==2.0.1
+            cython: Cython==3.0.10
             skip_cothread: yes
 
           # Windows py builds
 
           ## missing Microsoft Visual C++ 9.0
           #- os: windows-latest
-          #  python: "2.7"
+          #  python: "3.12"
           #  piparch: win_amd64
 
           - name: win64 3.5
@@ -270,18 +293,31 @@ jobs:
             profile: latest
             skip_cothread: yes
 
+          - name: win64 3.12
+            os: windows-latest
+            python: "3.12"
+            piparch: win_amd64
+            profile: latest
+            skip_cothread: yes
+
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
 
       - name: Setup native python
         if: matrix.python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
           #architecture: x64
 
+      # TLS 1.0 and 1.1 support was removed from pypi so the cached pip won't work
+      - name: Python 3.5 Fix
+        if: ${{ matrix.python == '3.5' }}
+        run: |
+          curl https://bootstrap.pypa.io/pip/3.5/get-pip.py | python
+
       - name: Automatic core dumper analysis
         uses: mdavidsaver/ci-core-dumper@master
 
@@ -358,7 +394,6 @@ jobs:
           python -m pip install p4p*.whl
           python -m ci_core_dumper exec python -m nose2 -v p4p
 
-
       - name: Docker PY build
         if: matrix.pyver && !matrix.base && !matrix.source
         run: |
@@ -370,7 +405,6 @@ jobs:
           [ -d dist ]
           ls dist/*
           export PATH="/opt/python/${{ matrix.pyver }}/bin:\$PATH"
-          export SETUPTOOLS_USE_DISTUTILS=stdlib
           which python
           python -m pip install -U pip
           python -m pip install setuptools wheel nose2
@@ -422,15 +456,15 @@ jobs:
         run: python -m twine check dist/p4p*.tar.*
 
       - name: Upload wheels
-        if: github.event_name=='push' && github.repository=='mdavidsaver/p4p' && github.ref=='refs/heads/master' && !matrix.base && !matrix.source
+        if: github.event_name=='push' && github.repository=='epics-base/p4p' && github.ref=='refs/heads/master' && !matrix.base && !matrix.source
         env:
           TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
         run: |
           python -m twine upload --skip-existing dist/p4p*.whl
 
       - name: Upload source
-        if: github.event_name=='push' && github.repository=='mdavidsaver/p4p' && github.ref=='refs/heads/master' && matrix.source && !matrix.base
+        if: github.event_name=='push' && github.repository=='epics-base/p4p' && github.ref=='refs/heads/master' && matrix.source && !matrix.base
         env:
           TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
diff --git a/README.md b/README.md
@@ -11,12 +11,12 @@ Python bindings for the PVAccess network client and server.
 
 See documentation
 
-https://mdavidsaver.github.io/p4p/
+https://epics-base.github.io/p4p/
 
 Source
 
-https://github.com/mdavidsaver/p4p/
+https://github.com/epics-base/p4p/
 
 CI results
 
-![Github Actions](https://github.com/mdavidsaver/p4p/workflows/P4P/badge.svg)
+![Github Actions](https://github.com/epics-base/p4p/workflows/P4P/badge.svg)
diff --git a/documentation/building.rst b/documentation/building.rst
@@ -4,7 +4,7 @@
 Building
 ========
 
-Release tars available from https://github.com/mdavidsaver/p4p/releases
+Release tars available from https://github.com/epics-base/p4p/releases
 
 The P4P modules requires:
 
@@ -104,7 +104,7 @@ or with PIP::
 
 From from versioned source.  (may replace "master" with release version number)::
 
-   git clone --branch master https://github.com/mdavidsaver/p4p.git
+   git clone --branch master https://github.com/epics-base/p4p.git
    cd p4p
 
 Set location of EPICS modules.  With EPICS >= 7.0.2::
@@ -152,7 +152,7 @@ If the necessary EPICS modules are not present, then they may be built from sour
 
    sudo apt-get install libreadline6-dev libncurses5-dev perl
    git clone https://github.com/epics-base/epics-base.git
-   git clone https://github.com/mdavidsaver/pvxs.git
+   git clone https://github.com/epics-base/pvxs.git
    cat <<EOF > pvxs/configure/RELEASE.local
    EPICS_BASE=$PWD/epics-base
    EOF
diff --git a/documentation/gw.rst b/documentation/gw.rst
@@ -231,9 +231,9 @@ Configuration is provided as a file using JSON syntax with C-style comments. ::
 
 See also PVXS client_ and server_ configuration references.
 
-.. _client: https://mdavidsaver.github.io/pvxs/client.html#configuration
+.. _client: https://epics-base.github.io/pvxs/client.html#configuration
 
-.. _server: https://mdavidsaver.github.io/pvxs/server.html#configuration
+.. _server: https://epics-base.github.io/pvxs/server.html#configuration
 
 Run ``pvagw --example-config -`` to see another example configuration.
 
diff --git a/documentation/index.rst b/documentation/index.rst
@@ -19,8 +19,8 @@ The recommended starting point is to install from pypi.org. ::
     python -m pip install p4p nose2
     python -m nose2 p4p   # Optional: runs automatic tests
 
-- VCS: https://github.com/mdavidsaver/p4p
-- Docs: https://mdavidsaver.github.io/p4p/
+- VCS: https://github.com/epics-base/p4p
+- Docs: https://epics-base.github.io/p4p/
 
 Contents:
 
diff --git a/documentation/values.rst b/documentation/values.rst
@@ -278,6 +278,6 @@ API Reference
 Relation to C++ API
 -------------------
 
-For those familiar with the `PVXS <https://mdavidsaver.github.io/pvxs/>` API.
+For those familiar with the `PVXS <https://epics-base.github.io/pvxs/>` API.
 A :py:class:`Type` wraps a TypeDef.
 :py:class:`Value` wraps a Value.
diff --git a/example/dynamicbox_server.py b/example/dynamicbox_server.py
@@ -19,6 +19,7 @@
 
 import sys
 import time, logging
+
 _log = logging.getLogger(__name__)
 
 from threading import Lock
diff --git a/example/monitor_meta.py b/example/monitor_meta.py
@@ -17,6 +17,7 @@ def cb(value):
         for fld in value.raw.asSet():
             print(" ",fld,value.raw[fld])
 
+
 print("Create Context")
 with Context('pva') as ctxt:
     print("Subscribe to", sys.argv[1])
diff --git a/example/ntscalar_walarm.py b/example/ntscalar_walarm.py
@@ -0,0 +1,19 @@
+import logging
+logger = logging.getLogger(__name__)
+
+from p4p.nt import NTScalar
+from p4p.server import Server
+from p4p.server.thread import SharedPV
+from p4p.server.nthandlers import NTScalarRulesHandler
+
+# Construct PV with control and valueAlarm structures
+# and then set the values of some of those values with a post
+pv = SharedPV(nt=NTScalar('d', control=True, valueAlarm=True),
+              handler=NTScalarRulesHandler(),
+              initial=12.0)
+pv.post({'control.limitHigh': 6,
+         'valueAlarm.active': True, 'valueAlarm.lowAlarmLimit': 1, 'valueAlarm.lowAlarmSeverity':2})
+
+Server.forever(providers=[{
+    'demo:pv:name':pv, # PV name only appears here
+}])
diff --git a/example/rpc_client.py b/example/rpc_client.py
@@ -24,9 +24,9 @@ def getargs():
     P.add_argument('prefix')
     P.add_argument('method')
     P.add_argument('args', nargs='*')
-    return P.parse_args()
+    return P, P.parse_args()
 
-args = getargs()
+P, args = getargs()
 
 logging.basicConfig(level=logging.DEBUG if args.debug else logging.INFO)
 
diff --git a/makehelper.py b/makehelper.py
@@ -33,14 +33,14 @@
 incdirs = [get_python_inc()]
 libdir = get_config_var('LIBDIR') or ''
 
-try:
-    from numpy.distutils.misc_util import get_numpy_include_dirs
-except ImportError:
-    def get_numpy_include_dirs():
-        from numpy import get_include
-        return [get_include()]
 
-incdirs = get_numpy_include_dirs()+incdirs
+def get_numpy_include_dirs():
+    from numpy import get_include
+
+    return [get_include()]
+
+
+incdirs = get_numpy_include_dirs() + incdirs
 
 print('TARGET_CFLAGS +=',get_config_var('BASECFLAGS'), file=out)
 print('TARGET_CXXFLAGS +=',get_config_var('BASECFLAGS'), file=out)
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,2 +1,14 @@
 [build-system]
-requires = ["setuptools", "setuptools_dso>=1.3a1", "wheel", "numpy", "Cython>=0.20", "epicscorelibs>=7.0.3.99.2.0a1", "pvxslibs"]
+requires = [
+    "setuptools",
+    "setuptools_dso>=2.7a1,<=2.10; python_version<='3.11'",
+    "setuptools_dso>=2.11a2; python_version>='3.12'",
+    "wheel",
+    "numpy",
+    "numpy>=2.0.1; python_version>='3.10'",
+    "Cython>=0.20",
+    "epicscorelibs==7.0.7.99.0.2; python_version<='3.11'",
+    "epicscorelibs>=7.0.7.99.1.1a2; python_version>='3.12'",
+    "pvxslibs==1.3.1; python_version<='3.11'",
+    "pvxslibs>=1.3.2a1; python_version>='3.12'",
+]
diff --git a/setup.py b/setup.py
diff --git a/src/p4p/disect.py b/src/p4p/disect.py
diff --git a/src/p4p/server/nthandlers.py b/src/p4p/server/nthandlers.py
diff --git a/src/p4p/test/test_value.py b/src/p4p/test/test_value.py
diff --git a/src/p4p/version.py b/src/p4p/version.py
diff --git a/src/pvxs_value.cpp b/src/pvxs_value.cpp
