Skip to content

Commit

Permalink
Merge pull request #111 from DiamondLightSource/110_precommit_broken
Browse files Browse the repository at this point in the history
Fix precommit hooks
  • Loading branch information
DominicOram authored Jul 4, 2023
2 parents 0f421aa + 3d91c26 commit 4337a5f
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
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
- id: check-merge-conflict

# Automatic source code formatting
- repo: https://github.com/psf/black
rev: 22.3.0
rev: 23.3.0
hooks:
- id: black
args: [--safe, --quiet]
Expand All @@ -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:
Expand All @@ -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$'
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies = [
"pillow",
"requests",
"graypy",
"pydantic",
"pydantic<2.0",
]
dynamic = ["version"]
license.file = "LICENSE"
Expand Down
1 change: 0 additions & 1 deletion src/dodal/devices/cryostream.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
1 change: 0 additions & 1 deletion src/dodal/devices/fluorescence_detector_motion.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@


class FluorescenceDetector(Device):

OUT = 0
IN = 1

Expand Down
1 change: 0 additions & 1 deletion src/dodal/devices/synchrotron.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ class SynchrotronTopUp(Device):


class Synchrotron(Device):

machine_status: SynchrotoronMachineStatus = Component(
SynchrotoronMachineStatus, "CS-CS-MSTAT-01:"
)
Expand Down

0 comments on commit 4337a5f

Please sign in to comment.