From 63e19916be7aed05d0ddb8dc3ecf5b2f8795aa62 Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Tue, 31 Mar 2020 11:01:13 +0100 Subject: [PATCH] Updated dependencies and version --- poetry.lock | 43 ++++++++++++++++++++++++++++++++++++++----- pyproject.toml | 4 ++-- 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/poetry.lock b/poetry.lock index d177e8f5..5fdf5085 100644 --- a/poetry.lock +++ b/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.4.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" @@ -349,12 +358,13 @@ version = "1.13.2b0" [package.extras] array = ["numpy"] doc = ["sphinx"] -test = ["coverage", "pytest", "mock", "pillow", "numpy"] +test = ["pillow", "coverage", "mock", "numpy", "pytest"] [package.source] reference = "79177fa7f28d6d5c6eab5ba814b420b1785b6b24" type = "git" url = "https://github.com/rwb27/picamera.git" + [[package]] category = "main" description = "Python Imaging Library (Fork)" @@ -692,11 +702,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 = "f7bb806f267f9f38aedfe6bb4ef6d23deef9df991c7117bd58f8c0e83c64b2b4" python-versions = "^3.6" [metadata.files] @@ -843,6 +864,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 +884,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.4.0-py3-none-any.whl", hash = "sha256:75fe8f65b89783bb852ad4d1463b2f721ea42f03ae06fbe3df76b85d8c65eac1"}, + {file = "labthings-0.4.0.tar.gz", hash = "sha256:e6b5c6c322915808f8833ec9aa81c7ede08282a0946a28562b5ca77549099ef4"}, ] lazy-object-proxy = [ {file = "lazy-object-proxy-1.4.3.tar.gz", hash = "sha256:f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0"}, @@ -914,6 +938,11 @@ markupsafe = [ {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6"}, {file = "MarkupSafe-1.1.1-cp37-cp37m-win32.whl", hash = "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2"}, {file = "MarkupSafe-1.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-win32.whl", hash = "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be"}, {file = "MarkupSafe-1.1.1.tar.gz", hash = "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"}, ] marshmallow = [ @@ -1190,3 +1219,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"}, +] diff --git a/pyproject.toml b/pyproject.toml index c5080ad0..0e431ab1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.masonry.api" [tool.poetry] name = "openflexure_microscope" -version = "2.0.0" +version = "2.0.1" description = "Python module, and Flask-based web API, to run the OpenFlexure Microscope." authors = [ @@ -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.4.0" [tool.poetry.extras] rpi = ["picamera", "RPi.GPIO"]