Merge branch 'master' into 'frame'

# Conflicts: # poetry.lock
2020-05-18 14:20:40 +00:00 · 2020-05-18 14:20:40 +00:00 · 81e8171517
commit 81e8171517
parent 0f912cb064 5c8d38b0e1
2 changed files with 14 additions and 0 deletions
--- a/pyproject.toml
+++ b/pyproject.toml
@ -56,6 +56,7 @@ rpi = ["RPi.GPIO"]
 build_static = 'openflexure_microscope.install:build'

 [tool.poetry.dev-dependencies]
+pynpm = "^0.1.2"
 sphinxcontrib-httpdomain = "^1.7"
 rope = "^0.14.0"
 pylint = "^2.3"