From d0d7817a604e9e9d0b4b42df16a5365d96b6732b Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 21 Sep 2020 09:40:27 +0100
Subject: [PATCH] Updated to LabThings 1.0.0

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

diff --git a/poetry.lock b/poetry.lock
index e8e9c7b5..dc6cd85c 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -286,26 +286,21 @@ i18n = ["Babel (>=0.8)"]
 
 [[package]]
 category = "main"
-description = ""
+description = "Python implementation of LabThings, based on the Flask microframework"
 name = "labthings"
 optional = false
-python-versions = "^3.6"
-version = "1.0.0-beta.1"
+python-versions = ">=3.6,<4.0"
+version = "1.0.0"
 
 [package.dependencies]
-Flask = "^1.1.1"
-apispec = "^3.2.0"
-apispec_webframeworks = "^0.5.2"
-flask-cors = "^3.0.8"
-marshmallow = "^3.4.0"
-webargs = "^6.0.0"
+Flask = ">=1.1.1,<2.0.0"
+apispec = ">=3.2.0,<4.0.0"
+apispec_webframeworks = ">=0.5.2,<0.6.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]
-reference = "03addeaa854180a19f2a1d18cefb92a189249ed3"
-type = "git"
-url = "https://github.com/labthings/python-labthings.git"
-
 [[package]]
 category = "dev"
 description = "A fast and thorough lazy object proxy."
@@ -328,11 +323,11 @@ description = "A lightweight library for converting complex datatypes to and fro
 name = "marshmallow"
 optional = false
 python-versions = ">=3.5"
-version = "3.7.1"
+version = "3.8.0"
 
 [package.extras]
 dev = ["pytest", "pytz", "simplejson", "mypy (0.782)", "flake8 (3.8.3)", "flake8-bugbear (20.1.4)", "pre-commit (>=2.4,<3.0)", "tox"]
-docs = ["sphinx (3.1.2)", "sphinx-issues (1.2.0)", "alabaster (0.7.12)", "sphinx-version-warning (1.1.2)", "autodocsumm (0.1.13)"]
+docs = ["sphinx (3.2.1)", "sphinx-issues (1.2.0)", "alabaster (0.7.12)", "sphinx-version-warning (1.1.2)", "autodocsumm (0.2.0)"]
 lint = ["mypy (0.782)", "flake8 (3.8.3)", "flake8-bugbear (20.1.4)", "pre-commit (>=2.4,<3.0)"]
 tests = ["pytest", "pytz", "simplejson"]
 
@@ -774,7 +769,7 @@ ifaddr = ">=0.1.7"
 rpi = ["RPi.GPIO"]
 
 [metadata]
-content-hash = "9e57655e8d25e1db4269183a131f7ffce2baba624610f105237c5a42d3abd681"
+content-hash = "3c51b3baa525aaf7113cc0bd234851b11e5ad03f34e57e958ada6451d526566b"
 python-versions = "^3.6"
 
 [metadata.files]
@@ -876,7 +871,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.0.0-py3-none-any.whl", hash = "sha256:dac2522bbbba84fc27b9468a24d70dee38c8d10916beccab51e67fdec081e6d8"},
+    {file = "labthings-1.0.0.tar.gz", hash = "sha256:4db133650131f21b0e0e8dff1c556c34c2e926af826704f9dbb958b679c6e2e9"},
+]
 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"},
@@ -931,8 +929,8 @@ markupsafe = [
     {file = "MarkupSafe-1.1.1.tar.gz", hash = "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"},
 ]
 marshmallow = [
-    {file = "marshmallow-3.7.1-py2.py3-none-any.whl", hash = "sha256:67bf4cae9d3275b3fc74bd7ff88a7c98ee8c57c94b251a67b031dc293ecc4b76"},
-    {file = "marshmallow-3.7.1.tar.gz", hash = "sha256:a2a5eefb4b75a3b43f05be1cca0b6686adf56af7465c3ca629e5ad8d1e1fe13d"},
+    {file = "marshmallow-3.8.0-py2.py3-none-any.whl", hash = "sha256:2272273505f1644580fbc66c6b220cc78f893eb31f1ecde2af98ad28011e9811"},
+    {file = "marshmallow-3.8.0.tar.gz", hash = "sha256:47911dd7c641a27160f0df5fd0fe94667160ffe97f70a42c3cc18388d86098cc"},
 ]
 mccabe = [
     {file = "mccabe-0.6.1-py2.py3-none-any.whl", hash = "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42"},
diff --git a/pyproject.toml b/pyproject.toml
index 2bf01803..581c887c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -46,8 +46,8 @@ sangaboard = "^0.2"
 expiringdict = "^1.2.1"
 camera-stage-mapping = "0.1.4"
 picamerax = ">=20.9.1"
-labthings = {git = "https://github.com/labthings/python-labthings.git"}
 pyyaml = "^5.3.1"
+labthings = "1.0.0"
 
 [tool.poetry.extras]
 rpi = ["RPi.GPIO"]