Merge remote-tracking branch 'origin/master' into labthings-070

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.masonry.api"
 
 [tool.poetry]
 name = "openflexure-microscope-server"
-version = "2.2.3"
+version = "2.2.5"
 description = "Python module, and Flask-based web API, to run the OpenFlexure Microscope."
 
 authors = [
@@ -44,9 +44,9 @@ opencv-python-headless = [
 ]
 labthings = {git = "https://github.com/labthings/python-labthings.git", rev = "simpler-spec"}
 pynpm = "^0.1.2"
-camera-stage-mapping = {git = "https://gitlab.com/openflexure/microscope-extensions/camera-stage-mapping.git", rev = "labthings-0.7"}
 sangaboard = "^0.2"
-gevent = "20.6.0"  # Pinned version to guarantee piwheels wheel
+expiringdict = "^1.2.1"
+camera-stage-mapping = "^0.1.2"
 
 [tool.poetry.extras]
 rpi = ["RPi.GPIO"]