Merge branch 'v2.1.0-dev' into stage-calibration

This commit is contained in:
Richard Bowman 2020-03-25 16:36:41 +00:00
commit 8a2a2abbec
12 changed files with 170 additions and 81 deletions

View file

@ -33,10 +33,10 @@ picamera = { git = "https://github.com/rwb27/picamera.git", branch = "master", o
"RPi.GPIO" = { version = "^0.6.5", optional = true }
pyserial = "^3.4" # Used for sangaboard (basic_serial_instrument) until we move to sangaboard pip library
labthings = { git = "https://github.com/labthings/python-labthings.git", branch = "master"} # TODO: Pin to a fixed version before 2.0.0 stable
python-dateutil = "^2.8"
psutil = "^5.6.7" # Autostorage extension
opencv-python-headless = "3.4.7.28"
labthings = "0.2.0"
[tool.poetry.extras]
rpi = ["picamera", "RPi.GPIO"]