Merge branch 'master' into stage-calibration

This commit is contained in:
Richard Bowman 2020-04-10 15:16:25 +01:00
commit 70d4c7e950
23 changed files with 1285 additions and 138 deletions

View file

@ -36,7 +36,7 @@ pyserial = "^3.4" # Used for sangaboard (basic_serial_instrument) until we move
python-dateutil = "^2.8"
psutil = "^5.6.7" # Autostorage extension
opencv-python-headless = "4.1.0.25"
labthings = "0.3.0"
labthings = "0.4.0"
[tool.poetry.extras]
rpi = ["picamera", "RPi.GPIO"]