rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 'capture-manager'

Browse source 
# Conflicts:
#   poetry.lock
#   pyproject.toml
This commit is contained in:
Joel Collins 2020-05-04 09:30:03 +00:00
commit 6d9314e0c9
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
poetry.lock generated
View file

@ -279,7 +279,7 @@ description = "Python implementation of LabThings, based on the Flask microframe
name = "labthings" name = "labthings"
optional = false optional = false
python-versions = ">=3.6,<4.0" python-versions = ">=3.6,<4.0"
version = "0.5.2" version = "0.5.3"
[package.dependencies] [package.dependencies]
Flask = ">=1.1.1,<2.0.0" Flask = ">=1.1.1,<2.0.0"
@ -313,12 +313,12 @@ description = "A lightweight library for converting complex datatypes to and fro
name = "marshmallow" name = "marshmallow"
optional = false optional = false
python-versions = ">=3.5" python-versions = ">=3.5"
version = "3.5.1" version = "3.5.2"
[package.extras] [package.extras]
dev = ["pytest", "pytz", "simplejson", "mypy (0.761)", "flake8 (3.7.9)", "flake8-bugbear (20.1.4)", "pre-commit (>=1.20,<3.0)", "tox"] dev = ["pytest", "pytz", "simplejson", "mypy (0.770)", "flake8 (3.7.9)", "flake8-bugbear (20.1.4)", "pre-commit (>=1.20,<3.0)", "tox"]
docs = ["sphinx (2.4.3)", "sphinx-issues (1.2.0)", "alabaster (0.7.12)", "sphinx-version-warning (1.1.2)"] docs = ["sphinx (3.0.3)", "sphinx-issues (1.2.0)", "alabaster (0.7.12)", "sphinx-version-warning (1.1.2)"]
lint = ["mypy (0.761)", "flake8 (3.7.9)", "flake8-bugbear (20.1.4)", "pre-commit (>=1.20,<3.0)"] lint = ["mypy (0.770)", "flake8 (3.7.9)", "flake8-bugbear (20.1.4)", "pre-commit (>=1.20,<3.0)"]
tests = ["pytest", "pytz", "simplejson"] tests = ["pytest", "pytz", "simplejson"]
[[package]] [[package]]
@ -735,7 +735,7 @@ ifaddr = "*"
rpi = ["picamera", "RPi.GPIO"] rpi = ["picamera", "RPi.GPIO"]
[metadata] [metadata]
content-hash = "f880f4ec9bc5aacc0b508e234779c32fe418f96db56eb4bc805ab22cba695d7e" content-hash = "78984c9fc264ae453f51e49d12d3d70e663b7d2a0d3a1829529339904d0c5c00"
python-versions = "^3.6" python-versions = "^3.6"
[metadata.files] [metadata.files]
@ -903,8 +903,8 @@ jinja2 = [
{file = "Jinja2-2.11.2.tar.gz", hash = "sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0"}, {file = "Jinja2-2.11.2.tar.gz", hash = "sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0"},
] ]
labthings = [ labthings = [
{file = "labthings-0.5.2-py3-none-any.whl", hash = "sha256:d7bc6a7566e8b53bbe44f9979cdaa82240b67e76d6414beabc2ccce5b8680c96"}, {file = "labthings-0.5.3-py3-none-any.whl", hash = "sha256:86ab087945fd1f824b1c1d6f8e05a7d149df5da5be650746a8432837ccc644b9"},
{file = "labthings-0.5.2.tar.gz", hash = "sha256:5816c9e924142e0a8b7ca1ed752a9efcd2724afe6da616e06d220ffc05c949e8"}, {file = "labthings-0.5.3.tar.gz", hash = "sha256:dc521e49d69031ef2754fa31c4f246b9b5c6aaed00f5d622c0a877970a8b9721"},
] ]
lazy-object-proxy = [ lazy-object-proxy = [
{file = "lazy-object-proxy-1.4.3.tar.gz", hash = "sha256:f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0"}, {file = "lazy-object-proxy-1.4.3.tar.gz", hash = "sha256:f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0"},
@ -965,8 +965,8 @@ markupsafe = [
{file = "MarkupSafe-1.1.1.tar.gz", hash = "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"}, {file = "MarkupSafe-1.1.1.tar.gz", hash = "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"},
] ]
marshmallow = [ marshmallow = [
{file = "marshmallow-3.5.1-py2.py3-none-any.whl", hash = "sha256:ac2e13b30165501b7d41fc0371b8df35944f5849769d136f20e2c5f6cdc6e665"}, {file = "marshmallow-3.5.2-py2.py3-none-any.whl", hash = "sha256:f12203bf8d94c410ab4b8d66edfde4f8a364892bde1f6747179765559f93d62a"},
{file = "marshmallow-3.5.1.tar.gz", hash = "sha256:90854221bbb1498d003a0c3cc9d8390259137551917961c8b5258c64026b2f85"}, {file = "marshmallow-3.5.2.tar.gz", hash = "sha256:56663fa1d5385c14c6a1236badd166d6dee987a5f64d2b6cc099dadf96eb4f09"},
] ]
mccabe = [ mccabe = [
{file = "mccabe-0.6.1-py2.py3-none-any.whl", hash = "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42"}, {file = "mccabe-0.6.1-py2.py3-none-any.whl", hash = "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42"},

2
pyproject.toml
View file

@ -39,7 +39,7 @@ opencv-python-headless = [
{version = "4.1.0.25", python = "~3.7"}, # PiWheels build for RPi running Py37 {version = "4.1.0.25", python = "~3.7"}, # PiWheels build for RPi running Py37
{version = "4.2.0.34", python = "^3.8"} # Latest for Py38 systems {version = "4.2.0.34", python = "^3.8"} # Latest for Py38 systems
] ]
labthings = "0.5.2" labthings = "0.5.3"
[tool.poetry.extras] [tool.poetry.extras]
rpi = ["picamera", "RPi.GPIO"] rpi = ["picamera", "RPi.GPIO"]