From e360ee31f33a4a1cd199536b9110e5ae1080da03 Mon Sep 17 00:00:00 2001 From: Pete R Jemian Date: Mon, 1 Jul 2024 08:58:51 -0500 Subject: [PATCH 1/7] CI #992 syntax --- .github/workflows/code.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml index 9fa2657f..51f84bd4 100644 --- a/.github/workflows/code.yml +++ b/.github/workflows/code.yml @@ -38,8 +38,7 @@ jobs: # https://github.com/davidslusser/actions_python_ruff/issues/2 - run: pip install ruff - - run: | - ruff check . + - run: ruff check . install-catalogs: name: Install & cache databroker catalogs From 2924c3842ff427942497b090dc3b1a74a3be1c86 Mon Sep 17 00:00:00 2001 From: Pete R Jemian Date: Mon, 1 Jul 2024 09:02:46 -0500 Subject: [PATCH 2/7] STY #992 remove unused imports; update autosummary --- apstools/devices/aps_undulator.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/apstools/devices/aps_undulator.py b/apstools/devices/aps_undulator.py index 0a62883b..65ba587a 100644 --- a/apstools/devices/aps_undulator.py +++ b/apstools/devices/aps_undulator.py @@ -1,11 +1,10 @@ """ -APS undulator -+++++++++++++++++++++++++++++++++++++++ +APS undulators +++++++++++++++ .. autosummary:: - ~ApsUndulator - ~ApsUndulatorDual + ~PlanarUndulator """ import logging @@ -17,9 +16,7 @@ from ophyd import EpicsSignal from ophyd import EpicsSignalRO from ophyd import PVPositioner -from ophyd import Signal -from .tracking_signal import TrackingSignal logger = logging.getLogger(__name__) From ddba354684692983806e9ea12758d03d957b8446 Mon Sep 17 00:00:00 2001 From: Pete R Jemian Date: Mon, 1 Jul 2024 09:13:55 -0500 Subject: [PATCH 3/7] PKG #992 pin numpy to v1. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 5fd632cd..81483839 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -62,7 +62,7 @@ dependencies = [ "intake<=1", "matplotlib", "mongoquery>=1.3.6", - "numpy", + "numpy==1", "ophyd>=1.6.1", "openpyxl", "pint", From 20c2b45e067f9c8643b03a4ccd303dd58fbd45f5 Mon Sep 17 00:00:00 2001 From: Pete R Jemian Date: Mon, 1 Jul 2024 09:22:35 -0500 Subject: [PATCH 4/7] CI #992 pin in the environment file --- environment.yml | 1 + pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 540c23f9..bb08b278 100644 --- a/environment.yml +++ b/environment.yml @@ -18,6 +18,7 @@ dependencies: - intake <=1 - matplotlib-base - mongoquery >=1.3.6 + - numpy <2 - openpyxl - ophyd >=1.6.1 - pandas diff --git a/pyproject.toml b/pyproject.toml index 81483839..5fd632cd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -62,7 +62,7 @@ dependencies = [ "intake<=1", "matplotlib", "mongoquery>=1.3.6", - "numpy==1", + "numpy", "ophyd>=1.6.1", "openpyxl", "pint", From c98d351b56c163655bb875cf3d858b28f38848a4 Mon Sep 17 00:00:00 2001 From: Pete R Jemian Date: Mon, 1 Jul 2024 09:41:19 -0500 Subject: [PATCH 5/7] DOC #992 --- CHANGES.rst | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 2090d175..95b7b03c 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -24,7 +24,18 @@ describe future plans. 1.6.20 ****** - release expected by 2024-04-30 + release expected by 2024-07-19 + + New Features + ------------ + + * Add new APS PlanarUndulator device. + + Maintenance + ----------- + + * Pin numpy<2 because upstream dask package needs a fix. + * Removed ApsUndulator and ApsUndulatorDual devices. 1.6.19 ****** @@ -34,8 +45,8 @@ released 2024-04-23 New Features ------------ -* Add new plan for edge alignment called edge_align -* Added a mesh grid scan plan that will collect until number of collection points is met +* Add new plan for edge alignment called edge_align. +* Added a mesh grid scan plan that will collect until number of collection points is met. Fixes ----- From a32018ea1572034c47d9d3b7b94ff4abe4464871 Mon Sep 17 00:00:00 2001 From: Pete R Jemian Date: Mon, 1 Jul 2024 09:48:10 -0500 Subject: [PATCH 6/7] MNT #992 refactor enumerations --- apstools/devices/aps_undulator.py | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/apstools/devices/aps_undulator.py b/apstools/devices/aps_undulator.py index 65ba587a..a20b6b3b 100644 --- a/apstools/devices/aps_undulator.py +++ b/apstools/devices/aps_undulator.py @@ -20,20 +20,7 @@ logger = logging.getLogger(__name__) - -class DoneStatus(IntEnum): - MOVING = 0 - DONE = 1 - - -class BusyStatus(IntEnum): - DONE = 0 - BUSY = 1 - - -class MotorDriveStatus(IntEnum): - NOT_READY = 0 - READY_TO_MOVE = 1 +POSITIONER_DONE = 1 class UndulatorPositioner(PVPositioner): @@ -50,7 +37,7 @@ class UndulatorPositioner(PVPositioner): actuate = Component(DerivedSignal, derived_from="parent.start_button", kind="omitted") stop_signal = Component(DerivedSignal, derived_from="parent.stop_button", kind="omitted") done = Component(DerivedSignal, derived_from="parent.done", kind="omitted") - done_value = DoneStatus.DONE + done_value = POSITIONER_DONE class PlanarUndulator(Device): From 4199725aec07c2ac8459228b6c7c8ad676b9e0aa Mon Sep 17 00:00:00 2001 From: Pete R Jemian Date: Mon, 1 Jul 2024 09:49:55 -0500 Subject: [PATCH 7/7] MNT #992 remove unused import --- apstools/devices/aps_undulator.py | 1 - 1 file changed, 1 deletion(-) diff --git a/apstools/devices/aps_undulator.py b/apstools/devices/aps_undulator.py index a20b6b3b..6bbc2b0f 100644 --- a/apstools/devices/aps_undulator.py +++ b/apstools/devices/aps_undulator.py @@ -8,7 +8,6 @@ """ import logging -from enum import IntEnum from ophyd import Component from ophyd import DerivedSignal