1.3.0a1

epics-base · Dec 6, 2023 · bf29d1a · bf29d1a
1 parent f1a8d4e
commit bf29d1a
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 19 deletions.
diff --git a/configure/CONFIG_PVXS_VERSION b/configure/CONFIG_PVXS_VERSION
@@ -1,6 +1,6 @@
 PVXS_MAJOR_VERSION = 1
-PVXS_MINOR_VERSION = 2
-PVXS_MAINTENANCE_VERSION = 4
+PVXS_MINOR_VERSION = 3
+PVXS_MAINTENANCE_VERSION = 0
 
 # Version range conditions in Makefiles
 #
@@ -12,7 +12,8 @@ PVXS_MAINTENANCE_VERSION = 4
 #
 # ifneq ($(PVXS_X_Y_Z),YES)   # PVXS != X.Y.Z
 #
-PVXS_1_2_4 = YES
+PVXS_1_3_0 = YES
+PVXS_1_2_4 = NO
 PVXS_1_2_3 = NO
 PVXS_1_2_2 = NO
 PVXS_1_2_1 = NO

diff --git a/documentation/ioc.rst b/documentation/ioc.rst
@@ -46,7 +46,7 @@ QSRV 2
 
 Beginning with PVXS 1.2.0 the functionality of `QSRV <https://epics-base.github.io/pva2pva>`_
 is replicated in the ``pvxsIoc`` library.
-Currently this feature preview is considered **beta** level with equivalent functionality.
+As of 1.3.0 this feature preview is considered **beta** level with equivalent functionality.
 
 It is recommended not to load both ``pvxsIoc.dbd`` and ``qsrv.dbd`` in the same IOC process.
 However, if this is done.  Users may opt out at runtime by setting
@@ -166,7 +166,7 @@ and is a member of the "op" group (supported on POSIX targets and Windows).
 PVAccess Links
 ^^^^^^^^^^^^^^
 
-Since PVXS UNRELEASED.
+Since PVXS 1.3.0.
 
 When built against Base >= 7.0.1, support is enabled for PVAccess links
 using JSON link support syntax. ::

diff --git a/documentation/pvalink.rst b/documentation/pvalink.rst
@@ -3,7 +3,7 @@
 PVA Links
 #########
 
-Since UNRELEASED
+Since 1.3.0
 
 JSON Reference
 ==============

diff --git a/documentation/releasenotes.rst b/documentation/releasenotes.rst
@@ -3,15 +3,15 @@
 Release Notes
 =============
 
-1.3.0 (UNRELEASED)
-------------------
+1.3.0 (Dec 2023)
+----------------
 
 * Set TCP_NODELAY on client and server sockets.
 * Disambiguate Size from Selector when decoding messages.
 * QSRV
-  * :ref:`qsrv2` now considered "feature complete".
-  * Avoid sending 0 precision w/ integer value.
-  * Add PVA link support.
+   * :ref:`qsrv2` now considered "feature complete".
+   * Avoid sending 0 precision w/ integer value.
+   * Add :ref:`pvalink`.
 
 1.2.4 (Oct 2023)
 ----------------
@@ -24,7 +24,7 @@ Release Notes
   released promptly when that operation is ended.
 * server: relax post() after finish().  Return false instead of throwing ``std::logic_error``.
 * ioc: ensure db_cancel_event() before ~MonitorControlOp
-  * Workaround for [db_cancel_event()](https://github.com/epics-base/epics-base/issues/423) bug.
+   * Workaround for [db_cancel_event()](https://github.com/epics-base/epics-base/issues/423) bug.
 * ioc: Fix typo preventing processing of DBR_STRING fields.
 * ioc: fix group put always `dbProcess()`.
 * ioc: fix block=true to DBF_ENUM.

diff --git a/documentation/util.rst b/documentation/util.rst
@@ -133,6 +133,20 @@ which may be used as a `std::ostream` to append text describing a test. eg. ::
 .. doxygenclass:: pvxs::testCase
     :members:
 
+IOC Testing
+^^^^^^^^^^^
+
+Additional helpers for testing IOC applications. ::
+
+    #include <pvxs/iochooks.h>
+    namespace pvxs { namespace ioc { ... } }
+
+When possible, use of the ``TestIOC`` class is recommended for both
+forward and backward compatibility with EPICS Base (>= 3.15.0.1).
+
+.. doxygenclass:: pvxs::ioc::TestIOC
+
+
 Utilities
 ---------
 

diff --git a/ioc/pvxs/iochooks.h b/ioc/pvxs/iochooks.h
@@ -101,18 +101,18 @@ PVXS_IOC_API
 void testShutdown();
 
 /** Call just after testIocShutdownOk()
- *  @since UNRELEASED
+ *  @since 1.3.0
  */
 PVXS_IOC_API
 void testAfterShutdown();
 
 /** Call just before testdbCleanup()
- *  @since UNRELEASED
+ *  @since 1.3.0
  */
 PVXS_IOC_API
 void testCleanupPrepare();
 
-#if EPICS_VERSION_INT >= VERSION_INT(3, 15, 0 ,0)
+#if _DOXYGEN_ || EPICS_VERSION_INT >= VERSION_INT(3, 15, 0 ,0)
 
 /** Manage Test IOC life-cycle calls.
  *
@@ -121,7 +121,7 @@ void testCleanupPrepare();
  *
  @code
  *  MAIN(mytest) {
- *      testPlan(0);
+ *      testPlan(0); // TODO: Set actual number of tests
  *      pvxs::testSetup();
  *      pvxs::logger_config_env(); // (optional)
  *      {
@@ -144,11 +144,11 @@ void testCleanupPrepare();
  *          ... repeat ...
  *      }
  *      epicsExitCallAtExits();
- *      cleanup_for_valgrind();
+ *      pvxs::cleanup_for_valgrind();
  *  }
  @endcode
  *
- *  @since UNRELEASED
+ *  @since 1.3.0
  */
 class PVXS_IOC_API TestIOC final {
     bool isRunning = false;

diff --git a/setup.py b/setup.py
@@ -697,7 +697,7 @@ def define_DSOS(self):
 
 
 pvxs_ver = '%(PVXS_MAJOR_VERSION)s.%(PVXS_MINOR_VERSION)s.%(PVXS_MAINTENANCE_VERSION)s'%pvxsversion
-#pvxs_ver += 'a1'
+pvxs_ver += 'a1'
 
 with open(os.path.join(os.path.dirname(__file__), 'README.md')) as F:
     long_description = F.read()