From 7a849c725a795215527424b9cc78eb5fdee15e90 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 30 Nov 2020 16:23:02 +0000
Subject: [PATCH] Test on new LabThings branch

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

diff --git a/poetry.lock b/poetry.lock
index 7cfd28ce..5ca93cb1 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -340,17 +340,24 @@ version = "1.1.6"
 description = "Python implementation of LabThings, based on the Flask microframework"
 category = "main"
 optional = false
-python-versions = ">=3.6,<4.0"
+python-versions = "^3.6"
+develop = true
 
 [package.dependencies]
 apispec = ">=3.2,<5.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"
+apispec_webframeworks = "^0.5.2"
+Flask = "^1.1.1"
+flask-cors = "^3.0.8"
+marshmallow = "^3.4.0"
+webargs = "^6.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"
@@ -434,7 +441,7 @@ numpy = ">=1.17.3"
 
 [[package]]
 name = "packaging"
-version = "20.4"
+version = "20.7"
 description = "Core utilities for Python packages"
 category = "main"
 optional = false
@@ -442,7 +449,6 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [package.dependencies]
 pyparsing = ">=2.0.2"
-six = "*"
 
 [[package]]
 name = "pastel"
@@ -949,7 +955,7 @@ rpi = ["RPi.GPIO"]
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7.3"
-content-hash = "6309f2d5e874193ed420e2b7a4b399be69c82c7d2ee1eaaad8634706daa3422e"
+content-hash = "61ef63ad367aade04025dd0383286671481252c2efba2c068315522b11664206"
 
 [metadata.files]
 alabaster = [
@@ -1102,10 +1108,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-1.1.6-py3-none-any.whl", hash = "sha256:ca3c906b29f7b7ba86ee11d858ecf05d7a34f2d277f3e87af8a255d5825b3992"},
-    {file = "labthings-1.1.6.tar.gz", hash = "sha256:30901ea6b1fb1f7468c92a0ebfc5a138e324a2886928720ace1a58761f369ab8"},
-]
+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"},
@@ -1239,8 +1242,8 @@ opencv-python-headless = [
     {file = "opencv_python_headless-4.4.0.44-cp38-cp38-win_amd64.whl", hash = "sha256:93f251c28739d8e8ade8898ddcbd75dcec60f779d9534644c568e7e65e2b76de"},
 ]
 packaging = [
-    {file = "packaging-20.4-py2.py3-none-any.whl", hash = "sha256:998416ba6962ae7fbd6596850b80e17859a5753ba17c32284f67bfff33784181"},
-    {file = "packaging-20.4.tar.gz", hash = "sha256:4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8"},
+    {file = "packaging-20.7-py2.py3-none-any.whl", hash = "sha256:eb41423378682dadb7166144a4926e443093863024de508ca5c9737d6bc08376"},
+    {file = "packaging-20.7.tar.gz", hash = "sha256:05af3bb85d320377db281cf254ab050e1a7ebcbf5410685a9a407e18a1f81236"},
 ]
 pastel = [
     {file = "pastel-0.2.1-py2.py3-none-any.whl", hash = "sha256:4349225fcdf6c2bb34d483e523475de5bb04a5c10ef711263452cb37d7dd4364"},
diff --git a/pyproject.toml b/pyproject.toml
index f2fa51ac..332b4692 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 = "1.1.6"
+labthings = {git = "https://github.com/labthings/python-labthings", branch="new-extension-manifest", develop = true}
 
 [tool.poetry.extras]
 rpi = ["RPi.GPIO"]