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

Upgrade numpy

Browse source 
numpy/scipy were mismatched in version, which led to a confusing
import error.  I've removed the numpy version specification entirely
and left it to scipy to ensure numpy
is installed.  This could do with
review in the future...
This commit is contained in:
Richard Bowman 2021-02-18 14:33:07 +00:00
parent 20001e4946
commit 414fd55c5b
2 changed files with 33 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

40
poetry.lock generated
View file

@ -620,11 +620,11 @@ reference = "piwheels"
[[package]] [[package]]
name = "numpy" name = "numpy"
version = "1.19.2" version = "1.20.1"
description = "NumPy is the fundamental package for array computing with Python." description = "NumPy is the fundamental package for array computing with Python."
category = "main" category = "main"
optional = false optional = false
python-versions = ">=3.6" python-versions = ">=3.7"
[package.source] [package.source]
type = "legacy" type = "legacy"
@ -947,17 +947,12 @@ reference = "piwheels"
[[package]] [[package]]
name = "pyyaml" name = "pyyaml"
version = "5.4" version = "5.4.1"
description = "YAML parser and emitter for Python" description = "YAML parser and emitter for Python"
category = "main" category = "main"
optional = false optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
[package.source]
type = "legacy"
url = "https://www.piwheels.org/simple"
reference = "piwheels"
[[package]] [[package]]
name = "requests" name = "requests"
version = "2.25.1" version = "2.25.1"
@ -1383,7 +1378,7 @@ rpi = ["RPi.GPIO"]
[metadata] [metadata]
lock-version = "1.1" lock-version = "1.1"
python-versions = "^3.7.3" python-versions = "^3.7.3"
content-hash = "7144f1f0652692911988bfc402489aa1d693d818e4152c57dca592d1c4f65fe1" content-hash = "26a514da40cebddf91dd6020cb4a8f130e8684063d3aaf6a984e548b16338575"
[metadata.files] [metadata.files]
alabaster = [ alabaster = [
@ -1515,8 +1510,8 @@ mypy-extensions = [
{file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"}, {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
] ]
numpy = [ numpy = [
{file = "numpy-1.19.2-cp37-cp37m-linux_armv6l.whl", hash = "sha256:bff0719af5134d472546e601f83e5335ec8919464084b34d602541fc80a33698"}, {file = "numpy-1.20.1-cp37-cp37m-linux_armv6l.whl", hash = "sha256:23d6802e7f2ceb9a1572f375470478251e821bdb4babbbbf3f2420c858d5dbde"},
{file = "numpy-1.19.2-cp37-cp37m-linux_armv7l.whl", hash = "sha256:bff0719af5134d472546e601f83e5335ec8919464084b34d602541fc80a33698"}, {file = "numpy-1.20.1-cp37-cp37m-linux_armv7l.whl", hash = "sha256:23d6802e7f2ceb9a1572f375470478251e821bdb4babbbbf3f2420c858d5dbde"},
] ]
numpy-stubs = [] numpy-stubs = []
opencv-python-headless = [ opencv-python-headless = [
@ -1581,8 +1576,27 @@ pytz = [
{file = "pytz-2021.1-py2.py3-none-any.whl", hash = "sha256:eb10ce3e7736052ed3623d49975ce333bcd712c7bb19a58b9e2089d4057d0798"}, {file = "pytz-2021.1-py2.py3-none-any.whl", hash = "sha256:eb10ce3e7736052ed3623d49975ce333bcd712c7bb19a58b9e2089d4057d0798"},
] ]
pyyaml = [ pyyaml = [
{file = "PyYAML-5.4-cp37-cp37m-linux_armv6l.whl", hash = "sha256:64a89e4ab1e56c6bd2dcb4578df6a29b480abffcc78eba175fba87eb140da5d0"}, {file = "PyYAML-5.4.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922"},
{file = "PyYAML-5.4-cp37-cp37m-linux_armv7l.whl", hash = "sha256:64a89e4ab1e56c6bd2dcb4578df6a29b480abffcc78eba175fba87eb140da5d0"}, {file = "PyYAML-5.4.1-cp27-cp27m-win32.whl", hash = "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393"},
{file = "PyYAML-5.4.1-cp27-cp27m-win_amd64.whl", hash = "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8"},
{file = "PyYAML-5.4.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185"},
{file = "PyYAML-5.4.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253"},
{file = "PyYAML-5.4.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc"},
{file = "PyYAML-5.4.1-cp36-cp36m-win32.whl", hash = "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5"},
{file = "PyYAML-5.4.1-cp36-cp36m-win_amd64.whl", hash = "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df"},
{file = "PyYAML-5.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018"},
{file = "PyYAML-5.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63"},
{file = "PyYAML-5.4.1-cp37-cp37m-win32.whl", hash = "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b"},
{file = "PyYAML-5.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf"},
{file = "PyYAML-5.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46"},
{file = "PyYAML-5.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb"},
{file = "PyYAML-5.4.1-cp38-cp38-win32.whl", hash = "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc"},
{file = "PyYAML-5.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696"},
{file = "PyYAML-5.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77"},
{file = "PyYAML-5.4.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183"},
{file = "PyYAML-5.4.1-cp39-cp39-win32.whl", hash = "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10"},
{file = "PyYAML-5.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db"},
{file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"},
] ]
requests = [ requests = [
{file = "requests-2.25.1-py2.py3-none-any.whl", hash = "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"}, {file = "requests-2.25.1-py2.py3-none-any.whl", hash = "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"},

11
pyproject.toml
View file

@ -31,19 +31,20 @@ packages = [
# Installing numpy/scipy/etc. from source is unlikely to work. # Installing numpy/scipy/etc. from source is unlikely to work.
# The block below forces Poetry to use piwheels. # The block below forces Poetry to use piwheels.
# We can add other repositories if we need them. # We can add other repositories if we need them.
# Setting default=true disables fallback to PyPI. # Setting default=true disables fallback to PyPI. I have removed
# this for now, because it will prevent installation on non-Pi
# platforms.
[[tool.poetry.source]] [[tool.poetry.source]]
name = "piwheels" name = "piwheels"
url = "https://www.piwheels.org/simple" url = "https://www.piwheels.org/simple"
default = true
[tool.poetry.dependencies] [tool.poetry.dependencies]
python = "^3.7.3" python = "^3.7.3"
Flask = "^1.0" Flask = "^1.0"
numpy = "1.19.2" # Exact version so we can guarantee a wheel # let scipy specify numpy?? numpy = "1.19.2" # Exact version so we can guarantee a wheel
Pillow = "^7.2.0" Pillow = "^7.2.0"
scipy = "1.6.1" # Exact version so we can guarantee a wheel scipy = "^1.6.1" # Exact version so we can guarantee a wheel
"RPi.GPIO" = { version = "^0.7.0", optional = true } "RPi.GPIO" = { version = "^0.7.0", optional = true }
python-dateutil = "^2.8" python-dateutil = "^2.8"
psutil = "^5.6.7" # Autostorage extension psutil = "^5.6.7" # Autostorage extension
@ -52,7 +53,7 @@ sangaboard = "^0.2"
expiringdict = "^1.2.1" expiringdict = "^1.2.1"
camera-stage-mapping = "0.1.4" camera-stage-mapping = "0.1.4"
picamerax = ">=20.9.1" picamerax = ">=20.9.1"
pyyaml = "5.4.0" # pyyaml 5.4.1 is broken in piwheels pyyaml = "^5.4.0" # pyyaml 5.4.1 is broken in piwheels
pytest-cov = "^2.10.1" pytest-cov = "^2.10.1"
piexif = "^1.1.3" piexif = "^1.1.3"
labthings = "^1.2.2" labthings = "^1.2.2"