Merge branch 'main' into 916-PVPositionerSoftDone-update

.github/workflows/code.yml

@@ -35,6 +35,7 @@ jobs:
         uses: davidslusser/[email protected]
         with:
           python_version: "3.11"
+          # see .ruff.toml file for options
 
   install-catalogs:
     name: Install & cache databroker catalogs

.ruff.toml

@@ -23,6 +23,7 @@ exclude = [
     "buck-out",
     "build",
     "dist",
+    "ideas",
     "node_modules",
     "site-packages",
     "venv",
@@ -40,7 +41,7 @@ target-version = "py38"
 # Unlike Flake8, Ruff doesn't enable pycodestyle warnings (`W`) or
 # McCabe complexity (`C901`) by default.
 select = ["E4", "E7", "E9", "F"]
-ignore = ["E402", "E741", "F405"]
+ignore = ["E402", "E741", "F401", "F403", "F405"]
 
 # Allow fix for all enabled rules (when `--fix`) is provided.
 fixable = ["ALL"]

CHANGES.rst

@@ -21,23 +21,39 @@ Project `milestones <https://github.com/BCDA-APS/apstools/milestones>`_
 describe future plans.
 
 ..
-   1.6.20
+   1.7.0
    ******
 
-   release expected by 2024-07-19
+   release expected by 2024-09-01
 
    New Features
    ------------
 
-   * Add new APS PlanarUndulator device.
-   * Add new APS Revolver_Undulator device.
-   * Add new APS STI_Undulator device.
+   * Add SpecWriterCallback2 (writes point-by-point to file).
 
-   Maintenance
-   -----------
+1.6.20
+******
+
+released 2024-07-10
+
+New Features
+------------
+
+* Add new APS PlanarUndulator device.
+* Add new APS Revolver_Undulator device.
+* Add new APS STI_Undulator device.
+* Add new APS Undulator2M device.
+* Add new APS Undulator4M device.
+
+Maintenance
+-----------
 
-   * Pin numpy<2 because upstream dask package needs a fix.
-   * Removed ApsUndulator and ApsUndulatorDual devices.
+* Describe ``.component_names`` in *What are the objects to control?*
+* Pin numpy<2 because upstream dask package needs a fix.
+* Removed ApsUndulator and ApsUndulatorDual devices.
+* Removed top-level requirements files.  They were not used.
+* Update APS cycle begin & end dates.
+* Update device support for APS machine parameters (current, lifetime, ...).
 
 1.6.19
 ******

apstools/callbacks/__init__.py

@@ -10,6 +10,7 @@
 from .spec_file_writer import SCAN_ID_RESET_VALUE
 from .spec_file_writer import SPEC_TIME_FORMAT
 from .spec_file_writer import SpecWriterCallback
+from .spec_file_writer import SpecWriterCallback2
 from .spec_file_writer import spec_comment
 
 # -----------------------------------------------------------------------------

apstools/callbacks/callback_base.py

@@ -88,6 +88,9 @@ def receiver(self, key, doc):
         if handler is None:
             logger.error("unexpected key %s" % key)
         else:
+            ts = doc.get("time")
+            if ts is not None:
+                self.doc_timestamp = ts
             handler(doc)
 
         # - - - - - - - - - - - - - - -
@@ -100,6 +103,7 @@ def clear(self):
         self.detectors = []
         self.exit_status = None
         self.externals = {}
+        self.doc_timestamp = None
         self.metadata = {}
         self.plan_name = None
         self.positioners = []