Merge branch 'master' into 'capture-manager'

# Conflicts:
#   poetry.lock
#   pyproject.toml
This commit is contained in:
Joel Collins 2020-05-04 09:30:03 +00:00
commit 6d9314e0c9
2 changed files with 11 additions and 11 deletions

View file

@ -39,7 +39,7 @@ opencv-python-headless = [
{version = "4.1.0.25", python = "~3.7"}, # PiWheels build for RPi running Py37
{version = "4.2.0.34", python = "^3.8"} # Latest for Py38 systems
]
labthings = "0.5.2"
labthings = "0.5.3"
[tool.poetry.extras]
rpi = ["picamera", "RPi.GPIO"]