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

Merge branch 'frame' into 'master'

Browse source 
eV submodule and tar distribution

Closes #136

See merge request openflexure/openflexure-microscope-server!60
This commit is contained in:
Joel Collins 2020-05-18 14:20:51 +00:00
commit 764683977c
2 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
poetry.lock generated
View file

@ -290,7 +290,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.6.1" version = "0.6.2"
[package.dependencies] [package.dependencies]
Flask = ">=1.1.1,<2.0.0" Flask = ">=1.1.1,<2.0.0"
@ -453,6 +453,19 @@ isort = ">=4.2.5,<5"
mccabe = ">=0.6,<0.7" mccabe = ">=0.6,<0.7"
toml = ">=0.7.1" toml = ">=0.7.1"
[[package]]
category = "main"
description = "Python interface to your NPM and package.json."
name = "pynpm"
optional = false
python-versions = "*"
version = "0.1.2"
[package.extras]
all = ["Sphinx (>=1.5.1)", "check-manifest (>=0.25)", "coverage (>=4.0)", "isort (>=4.2.2)", "pydocstyle (>=1.0.0)", "pytest-cache (>=1.0)", "pytest-cov (>=1.8.0)", "pytest-pep8 (>=1.0.6)", "pytest (>=2.8.0)"]
docs = ["Sphinx (>=1.5.1)"]
tests = ["check-manifest (>=0.25)", "coverage (>=4.0)", "isort (>=4.2.2)", "pydocstyle (>=1.0.0)", "pytest-cache (>=1.0)", "pytest-cov (>=1.8.0)", "pytest-pep8 (>=1.0.6)", "pytest (>=2.8.0)"]
[[package]] [[package]]
category = "dev" category = "dev"
description = "Python interface to your NPM and package.json." description = "Python interface to your NPM and package.json."
@ -760,7 +773,7 @@ ifaddr = "*"
rpi = ["RPi.GPIO"] rpi = ["RPi.GPIO"]
[metadata] [metadata]
content-hash = "8874534b3ed4146a2da1884b8f69b639b4a06f41ab9d6ee17500513b2d76f1b9" content-hash = "4fbf4240ac033cff8c0879b570792626e29a5aa2c5ffa2ec08b825ef8c2b700c"
python-versions = "^3.6" python-versions = "^3.6"
[metadata.files] [metadata.files]
@ -929,8 +942,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.6.1-py3-none-any.whl", hash = "sha256:b5e7bbcb18508e9abd5bc392773ce09e93beabe360361289b43fbe2838b31fdb"}, {file = "labthings-0.6.2-py3-none-any.whl", hash = "sha256:b83997a7dd115e0bfe20c2d5c52741c0b747fe8044e12db7bf82a433f8493d8e"},
{file = "labthings-0.6.1.tar.gz", hash = "sha256:77e52e7eb64bf00a1aa6a5dcbaf8e5bf791a5599ea330c5ab44acd8cd3931f1a"}, {file = "labthings-0.6.2.tar.gz", hash = "sha256:6373e2d0fdd731752a6fabd09708adeaf233b67f0cdcabee669642f647e9d95d"},
] ]
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"},

3
pyproject.toml
View file

@ -46,7 +46,8 @@ 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.6.1" labthings = "0.6.2"
pynpm = "^0.1.2"
[tool.poetry.extras] [tool.poetry.extras]
rpi = ["RPi.GPIO"] rpi = ["RPi.GPIO"]