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

Merge branch 'master' into 'frame'

Browse source 
# Conflicts:
#   poetry.lock
This commit is contained in:
Joel Collins 2020-05-18 14:20:40 +00:00
commit 81e8171517
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
poetry.lock generated
View file

@ -466,6 +466,19 @@ all = ["Sphinx (>=1.5.1)", "check-manifest (>=0.25)", "coverage (>=4.0)", "isort
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]]
category = "dev"
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]]
category = "dev"
description = "Python parsing module"