Merge branch 'master' into 'mypy-coverage'

# Conflicts: # poetry.lock
2021-01-08 10:51:15 +00:00 · 2021-01-08 10:51:15 +00:00 · 5f48be3807
commit 5f48be3807
parent 5232b36644 bb7d543ecd
2 changed files with 3 additions and 21 deletions
--- a/pyproject.toml
+++ b/pyproject.toml
@ -56,7 +56,6 @@ rpi = ["RPi.GPIO"]
 rescue = 'openflexure_microscope.rescue.auto:main'

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