Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: eddybl/pythonSoftIOC
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2981d7d
Choose a base ref
...
head repository: DiamondLightSource/pythonSoftIOC
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4cb7ce4
Choose a head ref
  • 14 commits
  • 6 files changed
  • 2 contributors

Commits on Jun 23, 2026

  1. Pin pytest to work around API changes

    I can't see exactly what it is, but it must be somewhere in here:
    https://docs.pytest.org/en/stable/changelog.html#pytest-9-1-0-2026-06-13
    AlexanderWells-diamond committed Jun 23, 2026
    Configuration menu
    Copy the full SHA
    c47ad75 View commit details
    Browse the repository at this point in the history
  2. Merge pull request DiamondLightSource#207 from DiamondLightSource/fix_ci

    Pin pytest to work around API changes
    AlexanderWells-diamond authored Jun 23, 2026
    Configuration menu
    Copy the full SHA
    0bc7fa0 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2026

  1. Change manylinux image type

    Numpy no longer provides manylinux2014 images. It seems to be backwards
    compatible to just bump the manulinux version for all versions of Python
    that we support.
    AlexanderWells-diamond committed Jul 6, 2026
    Configuration menu
    Copy the full SHA
    1711080 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2026

  1. Configuration menu
    Copy the full SHA
    d871362 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bc1a67d View commit details
    Browse the repository at this point in the history
  3. Handle resetting severity and alarm

    I can't see a reason why we should only set these values if they are
    non-zero, it's perfectly valid to do this to reset errors
    AlexanderWells-diamond committed Jul 16, 2026
    Configuration menu
    Copy the full SHA
    6b991a4 View commit details
    Browse the repository at this point in the history
  4. Merge pull request DiamondLightSource#209 from DiamondLightSource/blo…

    …cking_alarm_fixes
    
    Correctly set alarms during blocking processing
    AlexanderWells-diamond authored Jul 16, 2026
    Configuration menu
    Copy the full SHA
    e59476a View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2026

  1. Configuration menu
    Copy the full SHA
    096beca View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2026

  1. Add Python3.14 non-free-threading builds

    Windows seems to default to using a free-threaded build, which isn't
    supported by upstream EPICS python packages.
    We don't really care to release a free-threading build anywhere really,
    so globally block it
    AlexanderWells-diamond committed Sep 11, 2026
    Configuration menu
    Copy the full SHA
    3d67a3c View commit details
    Browse the repository at this point in the history
  2. Remove Coverage from tests

    See DiamondLightSource/cothread#73
    
    The simplest solution seems to be to just remove coverage.
    AlexanderWells-diamond committed Sep 11, 2026
    Configuration menu
    Copy the full SHA
    747d492 View commit details
    Browse the repository at this point in the history
  3. Add CHANGELOG

    AlexanderWells-diamond committed Sep 11, 2026
    Configuration menu
    Copy the full SHA
    079ccda View commit details
    Browse the repository at this point in the history
  4. Merge pull request DiamondLightSource#212 from DiamondLightSource/add…

    …_cp314
    
    Add Python3.14 non-free-threading builds
    AlexanderWells-diamond authored Sep 11, 2026
    Configuration menu
    Copy the full SHA
    fff3697 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    7f350ff View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    4cb7ce4 View commit details
    Browse the repository at this point in the history
Loading