Merge remote-tracking branch 'origin/master' into flatten_lst_route

openflexure_microscope/api/app.py

@@ -2,7 +2,9 @@
 from gevent import monkey
 
 # Patch most system modules. Leave threads untouched so we can still use them normally if needed.
-monkey.patch_all(thread=False)
+print("Monkey patching with Gevenet")
+monkey.patch_all()
+print("Monkey patching successful")
 
 import time
 import atexit
@@ -177,4 +179,4 @@ if __name__ == "__main__":
     from labthings.server.wsgi import Server
 
     server = Server(app)
-    server.run(host="0.0.0.0", port=5000, debug=False)
+    server.run(host="0.0.0.0", port=5000, debug=True, zeroconf=True)

poetry.lock

@@ -219,6 +219,14 @@ optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 version = "2.9"
 
+[[package]]
+category = "main"
+description = "Enumerates all IP addresses on all network adapters of the system."
+name = "ifaddr"
+optional = false
+python-versions = "*"
+version = "0.1.6"
+
 [[package]]
 category = "dev"
 description = "Getting image size from png/jpeg/jpeg2000/gif file"
@@ -269,7 +277,7 @@ description = "Python implementation of LabThings, based on the Flask microframe
 name = "labthings"
 optional = false
 python-versions = ">=3.6,<4.0"
-version = "0.2.0"
+version = "0.3.0"
 
 [package.dependencies]
 Flask = ">=1.1.1,<2.0.0"
@@ -279,6 +287,7 @@ gevent = ">=1.4.0,<2.0.0"
 gevent-websocket = ">=0.10.1,<0.11.0"
 marshmallow = ">=3.4.0,<4.0.0"
 webargs = ">=5.5.3,<6.0.0"
+zeroconf = ">=0.24.5,<0.25.0"
 
 [[package]]
 category = "dev"
@@ -692,11 +701,22 @@ optional = false
 python-versions = "*"
 version = "1.11.2"
 
+[[package]]
+category = "main"
+description = "Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+name = "zeroconf"
+optional = false
+python-versions = "*"
+version = "0.24.5"
+
+[package.dependencies]
+ifaddr = "*"
+
 [extras]
 rpi = ["picamera", "RPi.GPIO"]
 
 [metadata]
-content-hash = "3a3a3bd4ffd7e0fe4c4c418a1b191c33afd375e6f06bb298189fd84ff75ee4cc"
+content-hash = "71b15705721aa7447357d24e79c6ff77f6844b4191eceb5e90a14942c5375b91"
 python-versions = "^3.6"
 
 [metadata.files]
@@ -843,6 +863,9 @@ idna = [
     {file = "idna-2.9-py2.py3-none-any.whl", hash = "sha256:a068a21ceac8a4d63dbfd964670474107f541babbd2250d61922f029858365fa"},
     {file = "idna-2.9.tar.gz", hash = "sha256:7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb"},
 ]
+ifaddr = [
+    {file = "ifaddr-0.1.6.tar.gz", hash = "sha256:c19c64882a7ad51a394451dabcbbed72e98b5625ec1e79789924d5ea3e3ecb93"},
+]
 imagesize = [
     {file = "imagesize-1.2.0-py2.py3-none-any.whl", hash = "sha256:6965f19a6a2039c7d48bca7dba2473069ff854c36ae6f19d2cde309d998228a1"},
     {file = "imagesize-1.2.0.tar.gz", hash = "sha256:b1f6b5a4eab1f73479a50fb79fcf729514a900c341d8503d62a62dbc4127a2b1"},
@@ -860,8 +883,8 @@ jinja2 = [
     {file = "Jinja2-2.11.1.tar.gz", hash = "sha256:93187ffbc7808079673ef52771baa950426fd664d3aad1d0fa3e95644360e250"},
 ]
 labthings = [
-    {file = "labthings-0.2.0-py3-none-any.whl", hash = "sha256:e2235c0db45c7134403bd78b2aa55ae5aa1bfee677735c9674f52bfcb605e998"},
-    {file = "labthings-0.2.0.tar.gz", hash = "sha256:f77391bbb02676ac7c28de59c425c4dc8d6de63031f2a2db8bffd26bc691cb5e"},
+    {file = "labthings-0.3.0-py3-none-any.whl", hash = "sha256:605999a8fe09a52ad32a4763020b81e5d1b7b786478b47e1f45594aa10bcdd2d"},
+    {file = "labthings-0.3.0.tar.gz", hash = "sha256:cc93ee4510fc1304a450346e11d0069541142e8867cfcf8e4381a872abf16a6c"},
 ]
 lazy-object-proxy = [
     {file = "lazy-object-proxy-1.4.3.tar.gz", hash = "sha256:f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0"},
@@ -1190,3 +1213,7 @@ werkzeug = [
 wrapt = [
     {file = "wrapt-1.11.2.tar.gz", hash = "sha256:565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1"},
 ]
+zeroconf = [
+    {file = "zeroconf-0.24.5-py3-none-any.whl", hash = "sha256:83c4f611338096cafea46509d08e26891800b75abdead43d13bb13094c459187"},
+    {file = "zeroconf-0.24.5.tar.gz", hash = "sha256:893a841445663e0c4c20d1111ce41484bd62d58f59d653d0485187343368ef4a"},
+]

pyproject.toml

@@ -35,7 +35,7 @@ pyserial = "^3.4" # Used for sangaboard (basic_serial_instrument) until we move
 
 python-dateutil = "^2.8"
 psutil = "^5.6.7" # Autostorage extension
-labthings = "0.2.0"
+labthings = "0.3.0"
 
 [tool.poetry.extras]
 rpi = ["picamera", "RPi.GPIO"]