From 5f1bca91bf6da5b517b85751ddf5ccf00d06387d Mon Sep 17 00:00:00 2001
From: Joel Collins <jtc9242@gmail.com>
Date: Mon, 29 Jun 2020 13:49:54 +0100
Subject: [PATCH] Use simpler-spec branch of labthings (temporary pre-release)

---
 poetry.lock    | 33 ++++++++++++++++++---------------
 pyproject.toml |  2 +-
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 9dd9b4b5..4534f083 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -110,6 +110,7 @@ ofmclient = []
 reference = "87a66aadbbea211b260dc279c0f009a8a2b8de51"
 type = "git"
 url = "https://gitlab.com/openflexure/microscope-extensions/camera-stage-mapping.git"
+
 [[package]]
 category = "main"
 description = "Pure Python CBOR (de)serializer with extensive tag support"
@@ -317,23 +318,27 @@ i18n = ["Babel (>=0.8)"]
 
 [[package]]
 category = "main"
-description = "Python implementation of LabThings, based on the Flask microframework"
+description = ""
 name = "labthings"
 optional = false
-python-versions = ">=3.6,<4.0"
-version = "0.6.7"
+python-versions = "^3.6"
+version = "0.7.0-beta.0"
 
 [package.dependencies]
-Flask = ">=1.1.1,<2.0.0"
-apispec = ">=3.2.0,<4.0.0"
-cbor2 = ">=5.1.0,<6.0.0"
-flask-cors = ">=3.0.8,<4.0.0"
+Flask = "^1.1.1"
+apispec = "^3.2.0"
+cbor2 = "^5.1.0"
+flask-cors = "^3.0.8"
 gevent = ">=1.4,<21.0"
-gevent-websocket = ">=0.10.1,<0.11.0"
-marshmallow = ">=3.4.0,<4.0.0"
-webargs = ">=6.0.0,<7.0.0"
+gevent-websocket = "^0.10.1"
+marshmallow = "^3.4.0"
+webargs = "^6.0.0"
 zeroconf = ">=0.24.5,<0.28.0"
 
+[package.source]
+reference = "6d4c8737c4eb1d73632944f1db5b6c31af8b413f"
+type = "git"
+url = "https://github.com/labthings/python-labthings.git"
 [[package]]
 category = "dev"
 description = "A fast and thorough lazy object proxy."
@@ -433,6 +438,7 @@ test = ["coverage", "pytest", "mock", "pillow", "numpy"]
 reference = ""
 type = "url"
 url = "https://github.com/rwb27/picamera/releases/download/v1.13.2b0/picamera-1.13.2b0-py3-none-any.whl"
+
 [[package]]
 category = "main"
 description = "Python Imaging Library (Fork)"
@@ -835,7 +841,7 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"]
 rpi = ["RPi.GPIO"]
 
 [metadata]
-content-hash = "ae04fc9fc87b8a1dd96e9fe8b442fb6261d2ded29aef1385dcb35beac5d8f467"
+content-hash = "d6978ac9c76482b473689cd4a1e48348d7c93cbfcb823856f1bb3a6b46ed3283"
 python-versions = "^3.6"
 
 [metadata.files]
@@ -1003,10 +1009,7 @@ jinja2 = [
     {file = "Jinja2-2.11.2-py2.py3-none-any.whl", hash = "sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035"},
     {file = "Jinja2-2.11.2.tar.gz", hash = "sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0"},
 ]
-labthings = [
-    {file = "labthings-0.6.7-py3-none-any.whl", hash = "sha256:c39d3de301cc2c0b21e44bee49c84bdc912be84ace0168de7c16dc4966b4397b"},
-    {file = "labthings-0.6.7.tar.gz", hash = "sha256:5c70fde942436a21764f0ba7e5a77c0f080e51270dc8b4c69917b5b23e253c7b"},
-]
+labthings = []
 lazy-object-proxy = [
     {file = "lazy-object-proxy-1.4.3.tar.gz", hash = "sha256:f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0"},
     {file = "lazy_object_proxy-1.4.3-cp27-cp27m-macosx_10_13_x86_64.whl", hash = "sha256:a2238e9d1bb71a56cd710611a1614d1194dc10a175c1e08d75e1a7bcc250d442"},
diff --git a/pyproject.toml b/pyproject.toml
index ea51fa64..bf849fc7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -42,7 +42,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.6.7"
+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"}
 sangaboard = "^0.2"