From d9d58d03dd06a8dd926c8adf9bed258028a9c5b5 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 30 Nov 2020 16:58:12 +0000
Subject: [PATCH] Upgraded to LabThings 1.2.0

---
 poetry.lock    | 28 ++++++++++++----------------
 pyproject.toml |  2 +-
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 5ca93cb1..05785030 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -336,28 +336,21 @@ i18n = ["Babel (>=0.8)"]
 
 [[package]]
 name = "labthings"
-version = "1.1.6"
+version = "1.2.0"
 description = "Python implementation of LabThings, based on the Flask microframework"
 category = "main"
 optional = false
-python-versions = "^3.6"
-develop = true
+python-versions = ">=3.6,<4.0"
 
 [package.dependencies]
 apispec = ">=3.2,<5.0"
-apispec_webframeworks = "^0.5.2"
-Flask = "^1.1.1"
-flask-cors = "^3.0.8"
-marshmallow = "^3.4.0"
-webargs = "^6.0.0"
+apispec_webframeworks = ">=0.5.2,<0.6.0"
+Flask = ">=1.1.1,<2.0.0"
+flask-cors = ">=3.0.8,<4.0.0"
+marshmallow = ">=3.4.0,<4.0.0"
+webargs = ">=6.0.0,<7.0.0"
 zeroconf = ">=0.24.5,<0.29.0"
 
-[package.source]
-type = "git"
-url = "https://github.com/labthings/python-labthings"
-reference = "new-extension-manifest"
-resolved_reference = "427b12e4f739fc35bad05a25c099c29c3bba173d"
-
 [[package]]
 name = "lazy-object-proxy"
 version = "1.4.3"
@@ -955,7 +948,7 @@ rpi = ["RPi.GPIO"]
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7.3"
-content-hash = "61ef63ad367aade04025dd0383286671481252c2efba2c068315522b11664206"
+content-hash = "faa770c6eb6028fe292d4ad1d81a81afa45f79b4d2794c1ac0086c19be5740df"
 
 [metadata.files]
 alabaster = [
@@ -1108,7 +1101,10 @@ 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 = []
+labthings = [
+    {file = "labthings-1.2.0-py3-none-any.whl", hash = "sha256:3d5997cadb176706f0c079273211b61de267b2914cdae97f0dece46df347f779"},
+    {file = "labthings-1.2.0.tar.gz", hash = "sha256:54f6cac8ceb24db9e61306ecc66961d31be735d8dd14c99867e54f33f2e12b76"},
+]
 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 332b4692..0f1e4b75 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -46,7 +46,7 @@ pyyaml = "^5.3.1"
 typing-extensions = "^3.7.4"  # Needed for some type-hints in Python < 3.8 (e.g. Literal)
 pytest-cov = "^2.10.1"
 piexif = "^1.1.3"
-labthings = {git = "https://github.com/labthings/python-labthings", branch="new-extension-manifest", develop = true}
+labthings = "1.2.0"
 
 [tool.poetry.extras]
 rpi = ["RPi.GPIO"]