ophyd-async 0.13.5__tar.gz → 0.13.6__tar.gz

{ophyd_async-0.13.5 → ophyd_async-0.13.6}/.copier-answers.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier
-_commit: 5.0.0a3
+_commit: 5.0.0a4
 _src_path: https://github.com/DiamondLightSource/python-copier-template
 author_email: tom.cobb@diamond.ac.uk
 author_name: Tom Cobb

{ophyd_async-0.13.5 → ophyd_async-0.13.6}/.devcontainer/devcontainer.json

@@ -8,16 +8,22 @@
     "remoteEnv": {
         // Allow X11 apps to run inside the container
         "DISPLAY": "${localEnv:DISPLAY}",
+        // Put things that allow it in the persistent cache
+        "PRE_COMMIT_HOME": "/cache/pre-commit",
+        "UV_CACHE_DIR": "/cache/uv",
+        "UV_PYTHON_CACHE_DIR": "/cache/uv-python",
+        // Make a venv that is specific for this workspace path as the cache is shared
+        "UV_PROJECT_ENVIRONMENT": "/cache/venv-for${localWorkspaceFolder}",
         // Do the equivalent of "activate" the venv so we don't have to "uv run" everything
-        "VIRTUAL_ENV": "/workspaces/${localWorkspaceFolderBasename}/.venv",
-        "PATH": "/workspaces/${localWorkspaceFolderBasename}/.venv/bin:${containerEnv:PATH}"
+        "VIRTUAL_ENV": "/cache/venv-for${localWorkspaceFolder}",
+        "PATH": "/cache/venv-for${localWorkspaceFolder}/bin:${containerEnv:PATH}"
     },
     "customizations": {
         "vscode": {
             // Set *default* container specific settings.json values on container create.
             "settings": {
                 // Use the container's python by default
-                "python.defaultInterpreterPath": "/workspaces/${localWorkspaceFolderBasename}/.venv/bin/python",
+                "python.defaultInterpreterPath": "/cache/venv-for${localWorkspaceFolder}/bin/python",
                 // Don't activate the venv as it is already in the PATH
                 "python.terminal.activateEnvInCurrentTerminal": false,
                 "python.terminal.activateEnvironment": false,
@@ -47,9 +53,7 @@
         }
     },
     // Create the config folder for the bash-config feature and uv cache
-    // NOTE: The uv cache can get large, DLS users should read
-    // https://dev-guide.diamond.ac.uk/linux-user-environment/how-tos/disk-quota-troubleshooting
-    "initializeCommand": "mkdir -p ${localEnv:HOME}/.config/terminal-config ${localEnv:HOME}/.cache/uv",
+    "initializeCommand": "mkdir -p ${localEnv:HOME}/.config/terminal-config",
     "runArgs": [
         // Allow the container to access the host X11 display and EPICS CA
         "--net=host",
@@ -63,20 +67,15 @@
             "target": "/user-terminal-config",
             "type": "bind"
         },
-        // Keep a persistent cross container cache for uv
+        // Keep a persistent cross container cache for uv, pre-commit, and the venvs
         {
-            "source": "${localEnv:HOME}/.cache/uv",
-            "target": "/root/.cache/uv",
-            "type": "bind"
-        },
-        // Use a volume mount for the uv venv so it is local to the container
-        {
-            "target": "/workspaces/${localWorkspaceFolderBasename}/.venv",
+            "source": "devcontainer-shared-cache",
+            "target": "/cache",
             "type": "volume"
         }
     ],
     // Mount the parent as /workspaces so we can pip install peers as editable
     "workspaceMount": "source=${localWorkspaceFolder}/..,target=/workspaces,type=bind",
-    // After the container is created, install the python project in editable form
-    "postCreateCommand": "uv sync && uv run pre-commit install --install-hooks"
+    // After the container is created, recreate the venv then make pre-commit first run faster
+    "postCreateCommand": "uv venv --clear && uv sync && pre-commit install --install-hooks"
 }

{ophyd_async-0.13.5 → ophyd_async-0.13.6}/.github/CONTRIBUTING.md

@@ -24,4 +24,4 @@ It is recommended that developers use a [vscode devcontainer](https://code.visua
 
 This project was created using the [Diamond Light Source Copier Template](https://github.com/DiamondLightSource/python-copier-template) for Python projects.
 
-For more information on common tasks like setting up a developer environment, running the tests, and setting a pre-commit hook, see the template's [How-to guides](https://diamondlightsource.github.io/python-copier-template/5.0.0a3/how-to.html).
+For more information on common tasks like setting up a developer environment, running the tests, and setting a pre-commit hook, see the template's [How-to guides](https://diamondlightsource.github.io/python-copier-template/5.0.0a4/how-to.html).

{ophyd_async-0.13.5 → ophyd_async-0.13.6}/.github/workflows/_dist.yml

@@ -7,13 +7,13 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           # Need this to get version number from last tag
           fetch-depth: 0
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
 
       - name: Build sdist and wheel
         run: >

{ophyd_async-0.13.5 → ophyd_async-0.13.6}/.github/workflows/_docs.yml

@@ -12,7 +12,7 @@ jobs:
         run: sleep 60
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           # Need this to get version number from last tag
           fetch-depth: 0
@@ -21,7 +21,7 @@ jobs:
         run: sudo apt-get install graphviz
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v7
 
       - name: Build docs
         run: uv run --locked tox -e docs

{ophyd_async-0.13.5 → ophyd_async-0.13.6}/.github/workflows/_pypi.yml

@@ -8,7 +8,7 @@ jobs:
 
     steps:
       - name: Download dist artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: dist
           path: dist

{ophyd_async-0.13.5 → ophyd_async-0.13.6}/.github/workflows/_release.yml

@@ -7,7 +7,7 @@ jobs:
 
     steps:
       - name: Download artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           merge-multiple: true
 
@@ -23,7 +23,7 @@ jobs:
       - name: Create GitHub Release
         # We pin to the SHA, not the tag, for security reasons.
         # https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
-        uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631 # v2.2.2
+        uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1
         with:
           prerelease: ${{ contains(github.ref_name, 'a') || contains(github.ref_name, 'b') || contains(github.ref_name, 'rc') }}
           files: "*"

{ophyd_async-0.13.5 → ophyd_async-0.13.6}/.github/workflows/_test.yml

@@ -35,7 +35,7 @@ jobs:
 
     steps:
       - name: Checkout repository (with submodules)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
           fetch-depth: 0
@@ -47,7 +47,7 @@ jobs:
           echo "TEMP=D:\\Temp" >> $env:GITHUB_ENV
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v7
 
       - if: inputs.needs-services && inputs.runs-on != 'windows-latest'
         name: Run docker compose

{ophyd_async-0.13.5 → ophyd_async-0.13.6}/.github/workflows/_tox.yml

@@ -13,10 +13,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v7
 
       - name: Run tox
         run: uv run --locked tox -e ${{ inputs.tox }}

{ophyd_async-0.13.5/src/ophyd_async.egg-info → ophyd_async-0.13.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ophyd-async
-Version: 0.13.5
+Version: 0.13.6
 Summary: Asynchronous Bluesky hardware abstraction code, compatible with control systems like EPICS and Tango
 Author-email: Tom Cobb <tom.cobb@diamond.ac.uk>
 License: BSD 3-Clause License

{ophyd_async-0.13.5 → ophyd_async-0.13.6}/src/ophyd_async/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.13.5'
-__version_tuple__ = version_tuple = (0, 13, 5)
+__version__ = version = '0.13.6'
+__version_tuple__ = version_tuple = (0, 13, 6)
 
-__commit_id__ = commit_id = 'gbb7c98987'
+__commit_id__ = commit_id = 'g13f67ee23'

{ophyd_async-0.13.5 → ophyd_async-0.13.6}/src/ophyd_async/core/_mock_signal_backend.py

@@ -41,7 +41,9 @@ class MockSignalBackend(SignalBackend[SignalDatatypeT]):
     @cached_property
     def put_mock(self) -> AsyncMock:
         """Return the mock that will track calls to `put()`."""
-        put_mock = AsyncMock(name="put", spec=Callable)
+        put_mock = AsyncMock(
+            name="put", spec=Callable, side_effect=lambda *_, **__: None
+        )
         self.mock().attach_mock(put_mock, "put")
         return put_mock
 
@@ -66,8 +68,10 @@ class MockSignalBackend(SignalBackend[SignalDatatypeT]):
         return put_proceeds
 
     async def put(self, value: SignalDatatypeT | None, wait: bool):
-        await self.put_mock(value, wait=wait)
-        await self.soft_backend.put(value, wait=wait)
+        new_value = await self.put_mock(value, wait=wait)
+        if new_value is None:
+            new_value = value
+        await self.soft_backend.put(new_value, wait=wait)
         if wait:
             await self.put_proceeds.wait()
 

{ophyd_async-0.13.5 → ophyd_async-0.13.6}/src/ophyd_async/epics/pmac/_pmac_trajectory_generation.py

@@ -558,6 +558,9 @@ def _get_velocity_profile(
         # Check if all profiles have converged on min_time
         if np.isclose(new_min_time, min_time):
             for motor in motors:
+                # MIN_INTERVAL should be less than our convergence tolerance
+                # such that motors snap to the same point in the time grid
+                profiles[motor].quantize()
                 time_arrays[motor], velocity_arrays[motor] = profiles[
                     motor
                 ].make_arrays()

{ophyd_async-0.13.5 → ophyd_async-0.13.6}/src/ophyd_async/fastcs/panda/_block.py

@@ -34,15 +34,6 @@ class DataBlock(Device):
     datasets: SignalR[DatasetTable]
 
 
-class PulseBlock(Device):
-    """Used for configuring pulses in the PandA."""
-
-    delay: SignalRW[float]
-    pulses: SignalRW[int]
-    step: SignalRW[float]
-    width: SignalRW[float]
-
-
 class PandaPcompDirection(StrictEnum):
     """Direction options for position compare in the PandA."""
 
@@ -64,6 +55,16 @@ class PandaPosMux(SubsetEnum):
     ZERO = "ZERO"
 
 
+class PulseBlock(Device):
+    """Used for configuring pulses in the PandA."""
+
+    enable: SignalRW[PandaBitMux]
+    delay: SignalRW[float]
+    pulses: SignalRW[int]
+    step: SignalRW[float]
+    width: SignalRW[float]
+
+
 class PcompBlock(Device):
     """Position compare block in the PandA."""
 

{ophyd_async-0.13.5 → ophyd_async-0.13.6}/src/ophyd_async/testing/_mock_signal_utils.py

@@ -119,14 +119,17 @@ def _unset_side_effect_cm(put_mock: AsyncMock):
 
 def callback_on_mock_put(
     signal: Signal[SignalDatatypeT],
-    callback: Callable[[SignalDatatypeT, bool], None]
-    | Callable[[SignalDatatypeT, bool], Awaitable[None]],
+    callback: Callable[[SignalDatatypeT, bool], SignalDatatypeT | None]
+    | Callable[[SignalDatatypeT, bool], Awaitable[SignalDatatypeT | None]],
 ):
     """For setting a callback when a backend is put to.
 
     Can either be used in a context, with the callback being unset on exit, or
     as an ordinary function.
 
+    The value that the callback returns (if not None) will be set to the signal
+    readback. If None is returned then the readback will be set to the setpoint.
+
     :param signal: A signal with a `MockSignalBackend` backend.
     :param callback: The callback to call when the backend is put to during the
         context.

{ophyd_async-0.13.5 → ophyd_async-0.13.6/src/ophyd_async.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ophyd-async
-Version: 0.13.5
+Version: 0.13.6
 Summary: Asynchronous Bluesky hardware abstraction code, compatible with control systems like EPICS and Tango
 Author-email: Tom Cobb <tom.cobb@diamond.ac.uk>
 License: BSD 3-Clause License

{ophyd_async-0.13.5 → ophyd_async-0.13.6}/tests/unit_tests/core/test_mock_signal_backend.py

@@ -406,3 +406,49 @@ async def test_when_put_mock_called_with_typo_then_fails_but_calling_directly_pa
     with pytest.raises(AttributeError):
         mock.asssert_called_once()  # Note typo here is deliberate!
     await mock()
+
+
+async def test_when_callback_on_mock_put_returns_a_value_the_readback_is_set():
+    mock_signal = SignalRW(SoftSignalBackend(int))
+    await mock_signal.connect(mock=True)
+
+    callback_on_mock_put(mock_signal, lambda *_, **__: 2)
+
+    await mock_signal.set(5)
+    assert (await mock_signal.get_value()) == 2
+
+
+async def test_when_callback_on_mock_put_returns_none_then_readback_is_the_setpoint():
+    mock_signal = SignalRW(SoftSignalBackend(int))
+    await mock_signal.connect(mock=True)
+
+    callback_on_mock_put(mock_signal, lambda *_, **__: None)
+
+    await mock_signal.set(5)
+    assert (await mock_signal.get_value()) == 5
+
+
+async def test_when_async_callback_returns_a_value_the_readback_is_set():
+    mock_signal = SignalRW(SoftSignalBackend(int))
+    await mock_signal.connect(mock=True)
+
+    async def async_callback(*_, **__):
+        return 2
+
+    callback_on_mock_put(mock_signal, async_callback)
+
+    await mock_signal.set(5)
+    assert (await mock_signal.get_value()) == 2
+
+
+async def test_when_async_callback_returns_none_then_readback_is_the_setpoint():
+    mock_signal = SignalRW(SoftSignalBackend(int))
+    await mock_signal.connect(mock=True)
+
+    async def async_callback(*_, **__):
+        return None
+
+    callback_on_mock_put(mock_signal, async_callback)
+
+    await mock_signal.set(5)
+    assert (await mock_signal.get_value()) == 5

{ophyd_async-0.13.5 → ophyd_async-0.13.6}/tests/unit_tests/core/test_signal.py

@@ -163,6 +163,16 @@ async def test_set_and_wait_for_value_same_set_as_read():
     assert await signal.get_value() == 1
 
 
+async def test_set_and_wait_for_value_same_set_and_read_times_out():
+    signal = epics_signal_rw(int, "pva://pv", name="signal")
+    await signal.connect(mock=True)
+    assert await signal.get_value() == 0
+    callback_on_mock_put(signal, lambda v, _: v + 2)
+
+    with pytest.raises(asyncio.TimeoutError):
+        await set_and_wait_for_value(signal, 1, timeout=0.1)
+
+
 async def test_set_and_wait_for_value_different_set_and_read():
     set_signal = epics_signal_rw(int, "pva://set", name="set-signal")
     match_signal = epics_signal_r(str, "pva://read", name="match-signal")

{ophyd_async-0.13.5 → ophyd_async-0.13.6}/tests/unit_tests/epics/pmac/test_pmac_trajectory.py

@@ -126,16 +126,17 @@ async def test_pmac_trajectory_kickoff(
             1.0,
             1.0,
             1.0,
-            1.4,
+            1.395,
             3.0,
-            4.6,
+            4.605,
             5.0,
             5.0,
             5.0,
             5.0,
             5.0,
             5.0,
-        ]
+        ],
+        1e-3,
     )
 
     sim_y_motor_velocity_arrays = [
@@ -173,9 +174,9 @@ async def test_pmac_trajectory_kickoff(
             0.0,
             0.0,
             0.0,
-            4.0,
-            8.9442,
-            4.0,
+            3.951,
+            8.888,
+            3.951,
             0.0,
             0.0,
             0.0,
@@ -183,7 +184,7 @@ async def test_pmac_trajectory_kickoff(
             0.0,
             0.0,
         ],
-        1e-5,
+        1e-3,
     )