From 69e6b820a597c3ba3c06511476bd699560d619ea Mon Sep 17 00:00:00 2001 From: lucianom Date: Mon, 21 Sep 2020 08:44:22 +0100 Subject: [PATCH 1/3] Use numpy version 1.18.5 --- python/setup.py | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python/setup.py b/python/setup.py index d0cfe246..cda02299 100644 --- a/python/setup.py +++ b/python/setup.py @@ -13,7 +13,7 @@ install_requires=[ "flake8~=3.8", "matplotlib~=3.3", - "numpy~=1.19", + "numpy~=1.18", "pylint~=2.5", "pytest~=6.0", "pytest-xdist~=1.34", diff --git a/requirements.txt b/requirements.txt index 1fc594f3..5b68cfbb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,7 @@ # same modules should appear in the setup.py list as given below. flake8==3.8.3 matplotlib==3.3.1 -numpy==1.19.1 +numpy==1.18.5 pylint==2.5.3 pytest==6.0.0 pytest-xdist==1.34.0 From b90f5c09522382d9d912a03d03e453d7fa44fc17 Mon Sep 17 00:00:00 2001 From: lucianom Date: Mon, 21 Sep 2020 09:05:42 +0100 Subject: [PATCH 2/3] Add "packages=setuptools.find_packages()" in setup.py --- python/setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python/setup.py b/python/setup.py index cda02299..acc21dd0 100644 --- a/python/setup.py +++ b/python/setup.py @@ -10,6 +10,7 @@ # The same modules should appear in the requirements.txt file as given below. setuptools.setup( name='lib_mic_array', + packages=setuptools.find_packages(), install_requires=[ "flake8~=3.8", "matplotlib~=3.3", From ee013bb30236c029b9977abd4721d5652278d54b Mon Sep 17 00:00:00 2001 From: lucianom Date: Mon, 21 Sep 2020 09:27:59 +0100 Subject: [PATCH 3/3] Add comment --- requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/requirements.txt b/requirements.txt index 5b68cfbb..2e52a4d4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,6 +18,8 @@ # same modules should appear in the setup.py list as given below. flake8==3.8.3 matplotlib==3.3.1 + +# Pin numpy to 1.18.5 due to tensorflow v2.1.1 hard pinning it to that version. numpy==1.18.5 pylint==2.5.3 pytest==6.0.0