diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 34f2958fef..f14c5cf31d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v2.3.0 + rev: v4.4.0 hooks: - id: check-added-large-files - id: check-yaml @@ -8,7 +8,7 @@ repos: # Automatic source code formatting - repo: https://github.com/psf/black - rev: 22.3.0 + rev: 23.3.0 hooks: - id: black args: [--safe, --quiet] @@ -29,7 +29,7 @@ repos: # Linting - repo: https://github.com/pycqa/flake8 - rev: 4.0.1 + rev: 6.0.0 hooks: - id: flake8 additional_dependencies: @@ -38,7 +38,7 @@ repos: # Type checking - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.931 + rev: v1.4.1 hooks: - id: mypy files: 'src/.*\.py$' diff --git a/pyproject.toml b/pyproject.toml index 7783630d22..e1c22449bf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,7 +21,7 @@ dependencies = [ "pillow", "requests", "graypy", - "pydantic", + "pydantic<2.0", ] dynamic = ["version"] license.file = "LICENSE" diff --git a/src/dodal/devices/cryostream.py b/src/dodal/devices/cryostream.py index cfb344148e..52318ca56a 100644 --- a/src/dodal/devices/cryostream.py +++ b/src/dodal/devices/cryostream.py @@ -3,7 +3,6 @@ class Cryo(Device): - course: EpicsSignal = Cpt(EpicsSignal, "-EA-CJET-01:COARSE:CTRL") fine: EpicsSignal = Cpt(EpicsSignal, "-EA-CJET-01:FINE:CTRL") temp: EpicsSignalRO = Cpt(EpicsSignalRO, "-EA-CSTRM-01:TEMP") diff --git a/src/dodal/devices/fluorescence_detector_motion.py b/src/dodal/devices/fluorescence_detector_motion.py index 89b47c524d..1ced8a3504 100644 --- a/src/dodal/devices/fluorescence_detector_motion.py +++ b/src/dodal/devices/fluorescence_detector_motion.py @@ -3,7 +3,6 @@ class FluorescenceDetector(Device): - OUT = 0 IN = 1 diff --git a/src/dodal/devices/synchrotron.py b/src/dodal/devices/synchrotron.py index 4e0756414a..6a5b7727ce 100644 --- a/src/dodal/devices/synchrotron.py +++ b/src/dodal/devices/synchrotron.py @@ -13,7 +13,6 @@ class SynchrotronTopUp(Device): class Synchrotron(Device): - machine_status: SynchrotoronMachineStatus = Component( SynchrotoronMachineStatus, "CS-CS-MSTAT-01:" )