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

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

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier
-_commit: 4.1.0
+_commit: 5.0.0a3
 _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/.devcontainer/devcontainer.json

@@ -0,0 +1,82 @@
+// For format details, see https://containers.dev/implementors/json_reference/
+{
+    "name": "Python 3 Developer Container",
+    "build": {
+        "dockerfile": "../Dockerfile",
+        "target": "developer"
+    },
+    "remoteEnv": {
+        // Allow X11 apps to run inside the container
+        "DISPLAY": "${localEnv:DISPLAY}",
+        // 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}"
+    },
+    "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",
+                // Don't activate the venv as it is already in the PATH
+                "python.terminal.activateEnvInCurrentTerminal": false,
+                "python.terminal.activateEnvironment": false,
+                // Workaround to prevent garbled python REPL in the terminal
+                // https://github.com/microsoft/vscode-python/issues/25505
+                "python.terminal.shellIntegration.enabled": false,
+                "python.testing.unittestEnabled": false,
+                "python.testing.pytestEnabled": true,
+                "editor.formatOnSave": true,
+                "editor.codeActionsOnSave": {
+                    "source.organizeImports": "explicit"
+                },
+                "[python]": {
+                    "editor.defaultFormatter": "charliermarsh.ruff"
+                }
+            },
+            // Add the IDs of extensions you want installed when the container is created.
+            "extensions": [
+                "ms-python.python",
+                "github.vscode-github-actions",
+                "tamasfe.even-better-toml",
+                "redhat.vscode-yaml",
+                "ryanluker.vscode-coverage-gutters",
+                "charliermarsh.ruff",
+                "ms-azuretools.vscode-docker"
+            ]
+        }
+    },
+    // 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",
+    "runArgs": [
+        // Allow the container to access the host X11 display and EPICS CA
+        "--net=host",
+        // Make sure SELinux does not disable with access to host filesystems like tmp
+        "--security-opt=label=disable"
+    ],
+    "mounts": [
+        // Mount in the user terminal config folder so it can be edited
+        {
+            "source": "${localEnv:HOME}/.config/terminal-config",
+            "target": "/user-terminal-config",
+            "type": "bind"
+        },
+        // Keep a persistent cross container cache for uv
+        {
+            "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",
+            "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"
+}

{ophyd_async-0.13.3 → ophyd_async-0.13.5}/.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/4.1.0/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.0a3/how-to.html).

ophyd_async-0.13.5/.github/renovate.json

@@ -0,0 +1,53 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ],
+  "lockFileMaintenance": {
+    "description": "Keep uv.lock up to date, merging if tests pass",
+    "enabled": true,
+    "automerge": true    
+  },
+  "packageRules": [
+    {
+      "description": "Disable python version as that is managed by python-copier-template",
+      "matchManagers": [
+        "pyenv"
+      ],
+      "enabled": false
+    },
+    {
+      "description": "Disable github actions that are managed by python-copier-template",
+      "matchPackageNames": [
+        "actions/checkout",
+        "actions/download-artifact",
+        "actions/setup-python",
+        "actions/upload-artifact",
+        "astral-sh/setup-uv",
+        "codecov/codecov-action",
+        "docker/build-push-action",
+        "docker/login-action",
+        "docker/metadata-action",
+        "docker/setup-buildx-action",
+        "peaceiris/actions-gh-pages",
+        "pypa/gh-action-pypi-publish",
+        "softprops/action-gh-release"
+      ],
+      "matchManagers": [
+        "github-actions"
+      ],
+      "enabled": false
+    },
+    {
+      "description": "Group non-major github action updates",
+      "groupName": "GitHub Actions",
+      "matchUpdateTypes": [
+        "patch",
+        "minor"
+      ],
+      "matchManagers": [
+        "github-actions"
+      ]
+    }
+  ]
+}

{ophyd_async-0.13.3 → ophyd_async-0.13.5}/.github/workflows/_codeql.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: python
           build-mode: none
@@ -27,6 +27,6 @@ jobs:
           config-file: ./.github/codeql/codeql-config.yml
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4
         with:
           category: "/language:python"

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

@@ -12,10 +12,13 @@ jobs:
           # Need this to get version number from last tag
           fetch-depth: 0
 
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+
       - name: Build sdist and wheel
         run: >
           export SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct) &&
-          pipx run build
+          uvx --from build pyproject-build
 
       - name: Upload sdist and wheel as artifacts
         uses: actions/upload-artifact@v4
@@ -24,13 +27,19 @@ jobs:
           path: dist
 
       - name: Check for packaging errors
-        run: pipx run twine check --strict dist/*
+        run: uvx twine check --strict dist/*
 
       - name: Install produced wheel
-        uses: ./.github/actions/install_requirements
-        with:
-          pip-install: dist/*.whl
+        run: python -m pip install dist/*.whl
 
       - name: Test module --version works using the installed wheel
         # If more than one module in src/ replace with module name to test
         run: python -m $(ls --hide='*.egg-info' src | head -1) --version
+
+      - name: Check APIs are importable
+        run: |
+          python -c "import ophyd_async"
+          python -c "import ophyd_async.core"
+          python -c "import ophyd_async.epics.core"
+          python -c "import ophyd_async.epics.motor"
+          python -c "import ophyd_async.plan_stubs"

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

@@ -20,11 +20,11 @@ jobs:
       - name: Install system packages
         run: sudo apt-get install graphviz
 
-      - name: Install python packages
-        uses: ./.github/actions/install_requirements
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
 
       - name: Build docs
-        run: tox -e docs
+        run: uv run --locked tox -e docs
 
       - name: Remove environment.pickle
         run: rm build/html/.doctrees/environment.pickle

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

@@ -3,12 +3,20 @@ on:
     inputs:
       python-version:
         type: string
-        description: The version of python to install
-        required: true
+        description: The version of python to install, default is from .python-version file
+        default: ""
       runs-on:
         type: string
         description: The runner to run this job on
         required: true
+      tests-path:
+        type: string
+        description: The path to look for tests
+        required: true
+      needs-services:
+        type: boolean
+        description: Whether to start external services
+        required: true
     secrets:
       CODECOV_TOKEN:
         required: true
@@ -16,57 +24,52 @@ on:
 env:
   # https://github.com/pytest-dev/pytest/issues/2042
   PY_IGNORE_IMPORTMISMATCH: "1"
+  UV_PYTHON: ${{ inputs.python-version }}
 
 jobs:
   run:
     runs-on: ${{ inputs.runs-on }}
 
+    env:
+      COVERAGE_PROCESS_START: .coveragerc
+
     steps:
+      - name: Checkout repository (with submodules)
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
+
       - name: Set TEMP to D:/Temp
         if: inputs.runs-on == 'windows-latest'
         run: |
           mkdir "D:\\Temp"
           echo "TEMP=D:\\Temp" >> $env:GITHUB_ENV
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          # Need this to get version number from last tag
-          fetch-depth: 0
 
-      - if: inputs.python-version == 'dev'
-        name: Install dev versions of python packages
-        uses: ./.github/actions/install_requirements
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
 
-      - if: inputs.python-version == 'dev'
-        name: Write the requirements as an artifact
-        run: pip freeze --exclude-editable > /tmp/dev-requirements.txt
-
-      - if: inputs.python-version == 'dev'
-        name: Upload dev-requirements.txt
-        uses: actions/upload-artifact@v4
+      - if: inputs.needs-services && inputs.runs-on != 'windows-latest'
+        name: Run docker compose
+        uses: hoverkraft-tech/compose-action@v2.4.1
         with:
-          name: dev-requirements
-          path: /tmp/dev-requirements.txt
+          compose-file: "./example-services/compose.yaml"
+          services: |
+            bl01t-di-cam-01
+            ca-gateway
 
-      - if: inputs.python-version != 'dev'
-        name: Install latest versions of python packages
-        uses: ./.github/actions/install_requirements
-        with:
-          python-version: ${{ inputs.python-version }}
-          pip-install: ".[dev]"
-          
       - name: Run tests win
         if: inputs.runs-on == 'windows-latest'
-        run: tox -e tests -- --timeout=6
+        run: uv run --locked tox -e tests -- --timeout=10 ${{ inputs.tests-path}}
 
       - name: Non win tests
         if: inputs.runs-on != 'windows-latest'
-        run: tox -e tests -- --timeout=2
-      
+        run: uv run --locked tox -e tests -- --timeout=2 ${{ inputs.tests-path}}
+
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v5
         with:
-          name: ${{ inputs.python-version }}/${{ inputs.runs-on }}
+          name: ${{ inputs.python-version }}/${{ inputs.runs-on }}/${{ inputs.tests-path }}
           files: cov.xml
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

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

@@ -15,8 +15,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install python packages
-        uses: ./.github/actions/install_requirements
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
 
       - name: Run tox
-        run: tox -e ${{ inputs.tox }}
+        run: uv run --locked tox -e ${{ inputs.tox }}

{ophyd_async-0.13.3 → ophyd_async-0.13.5}/.github/workflows/ci.yml

@@ -5,11 +5,10 @@ on:
     branches:
       - main
     tags:
-      - '*'
+      - "*"
   pull_request:
 
 jobs:
-
   lint:
     uses: ./.github/workflows/_tox.yml
     with:
@@ -20,27 +19,24 @@ jobs:
       matrix:
         runs-on: ["ubuntu-latest", "windows-latest"] # can add macos-latest
         python-version: ["3.11", "3.12", "3.13"]
-        include:
-          # Include one that runs in the dev environment
-          - runs-on: "ubuntu-latest"
-            python-version: "dev"
+        test-config:
+          - tests-path: "tests/unit_tests"
+            needs-services: false
+          - tests-path: "tests/system_tests"
+            needs-services: true
       fail-fast: false
     uses: ./.github/workflows/_test.yml
     with:
       runs-on: ${{ matrix.runs-on }}
       python-version: ${{ matrix.python-version }}
+      tests-path: ${{ matrix.test-config.tests-path }}
+      needs-services: ${{ matrix.test-config.needs-services }}
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
-  import_with_no_extras:
-    uses: ./.github/workflows/_import_with_no_extras.yml
-
   docs:
     uses: ./.github/workflows/_docs.yml
 
-  system_tests:
-    uses: ./.github/workflows/_system_test.yml
-
   dist:
     uses: ./.github/workflows/_dist.yml
 
@@ -55,7 +51,7 @@ jobs:
     uses: ./.github/workflows/_codeql.yml
 
   release:
-    needs: [dist, test, docs, system_tests]
+    needs: [dist, test, docs]
     if: github.ref_type == 'tag'
     uses: ./.github/workflows/_release.yml
     permissions:

{ophyd_async-0.13.3 → ophyd_async-0.13.5}/.github/workflows/periodic.yml

@@ -10,6 +10,7 @@ jobs:
   linkcheck:
     uses: ./.github/workflows/_tox.yml
     with:
-      tox: docs build -- -b linkcheck
+      tox: docs -- -b linkcheck
+      
   codeql:
     uses: ./.github/workflows/_codeql.yml

ophyd_async-0.13.5/.gitleaks.toml

@@ -0,0 +1,19 @@
+# This allow-list is limited to YAML/YML files to cut down SealedSecrets false positives.
+# All gitleaks default rules still apply everywhere (useDefault = true).
+# To broaden this allow-list to all files, comment out the 'paths' line below.
+
+[extend]
+useDefault = true
+
+[[rules]]
+id = "generic-api-key"
+
+# Pattern-only allowlist for long Ag… tokens in YAML 
+[[rules.allowlists]]
+condition = "AND"
+regexes = [
+  # Boundary-safe Ag… token without lookarounds (RE2-safe)
+  '''(?:^|[^A-Za-z0-9+/=])(Ag[A-Za-z0-9+/]{500,}={0,2})(?:[^A-Za-z0-9+/=]|$)'''
+]
+# Limit to YAML only for now. Comment this out if you want it to apply everywhere.
+paths = ['''(?i).*\.ya?ml$''']

{ophyd_async-0.13.3 → ophyd_async-0.13.5}/.pre-commit-config.yaml

@@ -3,6 +3,7 @@ repos:
     rev: v5.0.0
     hooks:
       - id: check-added-large-files
+        args: ["--maxkb=1000"] # uv.lock is more than 500kB
       - id: check-yaml
       - id: check-merge-conflict
       - id: end-of-file-fixer
@@ -23,6 +24,13 @@ repos:
         types: [python]
         require_serial: true
 
+      - id: uv-sync
+        name: update uv.lock and venv
+        pass_filenames: false
+        language: system
+        entry: uv sync
+        files: ^(uv\.lock|pyproject\.toml)$
+
       - id: import-contracts
         name: Ensure import directionality
         pass_filenames: false
@@ -30,3 +38,8 @@ repos:
         entry: lint-imports
         types: [python]
         require_serial: false
+
+  - repo: https://github.com/gitleaks/gitleaks
+    rev: v8.28.0
+    hooks:
+      - id: gitleaks

ophyd_async-0.13.5/.python-version

@@ -0,0 +1 @@
+3.11

ophyd_async-0.13.5/Dockerfile

@@ -0,0 +1,10 @@
+# The devcontainer should use the developer target and run as root with podman
+# or docker with user namespaces.
+FROM ghcr.io/diamondlightsource/ubuntu-devcontainer:noble AS developer
+
+# Add any system dependencies for the developer/build environment here
+RUN apt-get update -y && apt-get install -y --no-install-recommends \
+    graphviz \
+    libxcb-cursor0 \
+    qt6-base-dev \
+    && apt-get dist-clean

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ophyd-async
-Version: 0.13.3
+Version: 0.13.5
 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
@@ -58,45 +58,11 @@ Requires-Dist: aioca>=2.0a4; extra == "ca"
 Provides-Extra: pva
 Requires-Dist: p4p>=4.2.0; extra == "pva"
 Provides-Extra: tango
-Requires-Dist: pytango==10.0.2; extra == "tango"
+Requires-Dist: pytango>=10.0.2; extra == "tango"
 Provides-Extra: demo
 Requires-Dist: ipython; extra == "demo"
 Requires-Dist: matplotlib; extra == "demo"
 Requires-Dist: pyqt6; extra == "demo"
-Provides-Extra: dev
-Requires-Dist: ophyd_async[sim]; extra == "dev"
-Requires-Dist: ophyd_async[ca]; extra == "dev"
-Requires-Dist: ophyd_async[pva]; extra == "dev"
-Requires-Dist: ophyd_async[tango]; extra == "dev"
-Requires-Dist: ophyd_async[demo]; extra == "dev"
-Requires-Dist: inflection; extra == "dev"
-Requires-Dist: import-linter; extra == "dev"
-Requires-Dist: myst-parser; extra == "dev"
-Requires-Dist: numpydoc; extra == "dev"
-Requires-Dist: ophyd>=1.10.7; extra == "dev"
-Requires-Dist: pickleshare; extra == "dev"
-Requires-Dist: pipdeptree; extra == "dev"
-Requires-Dist: pre-commit; extra == "dev"
-Requires-Dist: pydata-sphinx-theme>=0.12; extra == "dev"
-Requires-Dist: pyepics>=3.4.2; extra == "dev"
-Requires-Dist: pyright; extra == "dev"
-Requires-Dist: pytest; extra == "dev"
-Requires-Dist: pytest-asyncio; extra == "dev"
-Requires-Dist: pytest-cov; extra == "dev"
-Requires-Dist: pytest-faulthandler; extra == "dev"
-Requires-Dist: pytest-forked; extra == "dev"
-Requires-Dist: pytest-rerunfailures; extra == "dev"
-Requires-Dist: pytest-timeout; extra == "dev"
-Requires-Dist: ruff; extra == "dev"
-Requires-Dist: scanspec>=1.0a1; extra == "dev"
-Requires-Dist: sphinx-autobuild; extra == "dev"
-Requires-Dist: sphinx-autodoc2; extra == "dev"
-Requires-Dist: sphinxcontrib-mermaid; extra == "dev"
-Requires-Dist: sphinx-copybutton; extra == "dev"
-Requires-Dist: sphinx-design; extra == "dev"
-Requires-Dist: tox-direct; extra == "dev"
-Requires-Dist: types-mock; extra == "dev"
-Requires-Dist: types-pyyaml; extra == "dev"
 Dynamic: license-file
 
 [![CI](https://github.com/bluesky/ophyd-async/actions/workflows/ci.yml/badge.svg)](https://github.com/bluesky/ophyd-async/actions/workflows/ci.yml)

{ophyd_async-0.13.3 → ophyd_async-0.13.5}/docs/explanations/decisions/0009-procedural-vs-declarative-devices.md

@@ -138,3 +138,12 @@ class Sensor(StandardReadable, EpicsDevice):
     value: A[SignalR[float], PvSuffix("Value"), Format.HINTED_SIGNAL]
     mode: A[SignalRW[EnergyMode], PvSuffix("Mode"), Format.CONFIG_SIGNAL]
 ```
+
+Note that to use `Annotated as A` with ruff name checking we recommend adding something like:
+
+```
+[tool.ruff.lint.flake8-import-conventions.extend-aliases]
+# We often shorten "Annotated" to "A" for brevity
+"typing.Annotated" = "A"
+```
+to your `pyproject.toml`.

{ophyd_async-0.13.3 → ophyd_async-0.13.5}/docs/explanations/devices-signals-backends.md

@@ -62,7 +62,7 @@ SignalBackend <|-- TangoSignalConnector
 ```
 
 If a `Device` with children is like a branch in a tree, a `Signal` is like a leaf. It has no children, but represents a single value or action in the control system. There are 4 types of signal:
-- [](#SignalR) is a signal with a read-only value that supports the [Readable](#bluesky.protocols.Readable) and [Subscribable](#bluesky.protocols.Subscribable) protocols. It also adds the [](#SignalR.get_value) and [](#SignalR.subscribe_value) methods that are used to interact with the Signal in the parent Device.
+- [](#SignalR) is a signal with a read-only value that supports the [Readable](#bluesky.protocols.Readable) and [Subscribable](#bluesky.protocols.Subscribable) protocols. It also adds the [](#SignalR.subscribe_reading) method that is used to interact with the Signal in the parent Device.
 - [](#SignalW) is a signal with a write-only value that supports the [Movable](#bluesky.protocols.Movable) protocol.
 - [](#SignalRW) is a signal with a read-write value that inherits from SignalR and SignalW and adds the [Locatable](#bluesky.protocols.Locatable) protocol
 - [](#SignalX) is a signal that performs an action, and supports the [Triggerable](#bluesky.protocols.Triggerable) protocol

{ophyd_async-0.13.3 → ophyd_async-0.13.5}/docs/tutorials/writing-tests-for-devices.md

@@ -21,7 +21,7 @@ If we need to add a feature to a particular Device, or fix a bug, and it only af
 
 We will be writing a test using the pytest framework which encourages fixtures to setup and teardown the Devices we wish to test. In this case we will create the `DemoMotor` from the previous tutorial:
 
-```{literalinclude} ../../tests/epics/demo/test_epics_demo.py
+```{literalinclude} ../../tests/unit_tests/epics/demo/test_epics_demo.py
 :pyobject: mock_motor
 ```
 
@@ -49,7 +49,7 @@ asyncio_mode = "auto"
 
 Let's test some verbs. We want to check that we can `read()` and `read_configuration()` on a `DemoMotor` while staged, and that we can still call them when unstaged:
 
-```{literalinclude} ../../tests/epics/demo/test_epics_demo.py
+```{literalinclude} ../../tests/unit_tests/epics/demo/test_epics_demo.py
 :pyobject: test_read_motor
 ```
 
@@ -63,7 +63,7 @@ Some of our tests produce timestamps, instead of checking their values we use []
 
 Now let's call some verbs and check that they do the right thing. We want to check that `stop()` triggers the [](#SignalX) `stop_`, waiting for it to complete:
 
-```{literalinclude} ../../tests/epics/demo/test_epics_demo.py
+```{literalinclude} ../../tests/unit_tests/epics/demo/test_epics_demo.py
 :pyobject: test_motor_stopped
 ```
 
@@ -73,7 +73,7 @@ This time we use [](#get_mock_put) to get a [](#unittest.mock.Mock) that will be
 
 Now let's pretend to be a progress bar and check that we get the right outputs. We want to check that `set()` will call any progress watchers with appropriate updates, and also terminate when the readback value reaches the correct value:
 
-```{literalinclude} ../../tests/epics/demo/test_epics_demo.py
+```{literalinclude} ../../tests/unit_tests/epics/demo/test_epics_demo.py
 :pyobject: test_motor_moving_well
 ```
 
@@ -109,11 +109,11 @@ def RE():
 
 Now you can run a plan, and check that it produces the correct bluesky documents. Let's go back to the demo and test the `DemoPointDetector` in a `bp.count` plan:
 
-```{literalinclude} ../../tests/epics/demo/test_epics_demo.py
+```{literalinclude} ../../tests/unit_tests/epics/demo/test_epics_demo.py
 :pyobject: mock_point_detector
 ```
 
-```{literalinclude} ../../tests/epics/demo/test_epics_demo.py
+```{literalinclude} ../../tests/unit_tests/epics/demo/test_epics_demo.py
 :pyobject: test_point_detector_in_plan
 ```