Merge branch 'master' into 'pytest'

# Conflicts:
#   poetry.lock
This commit is contained in:
Joel Collins 2020-11-25 15:26:20 +00:00
commit f1060d9e6d
4 changed files with 14 additions and 28 deletions

View file

@ -38,19 +38,17 @@ scipy = "1.5.3" # Exact version so we can guarantee a wheel
python-dateutil = "^2.8"
psutil = "^5.6.7" # Autostorage extension
opencv-python-headless = "4.4.0.44"
pynpm = "^0.1.2"
sangaboard = "^0.2"
expiringdict = "^1.2.1"
camera-stage-mapping = "0.1.4"
picamerax = ">=20.9.1"
pyyaml = "^5.3.1"
labthings = "^1.1.3"
labthings = "^1.1.4"
[tool.poetry.extras]
rpi = ["RPi.GPIO"]
[tool.poetry.scripts]
build_static = 'openflexure_microscope.install:build'
rescue = 'openflexure_microscope.rescue.auto:main'
[tool.poetry.dev-dependencies]