From 64afb43a9b87a31f332ba90b0c06b0160c229d9b Mon Sep 17 00:00:00 2001 From: Carlo Grisetti Date: Tue, 3 Nov 2020 10:36:01 +0100 Subject: [PATCH 1/7] Limit max numpy version due to an issue on windows Numpy 1.19.4 has an issue on windows which prevents it from running correctly (numpy package refers to this URL https://tinyurl.com/y3dm3h86). I just tested with 1.19.3 and the issue is not present yet --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a885ee4cad0..48eb23aeac4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ Cython>=0.25 h5py>=2.6 -numpy>=1.15 +numpy>=1.15,<=1.19.3 pandas>=0.19 scipy>=0.18 tabulate>=0.7 From 0fa03655d2f731f1c874d80dfe1beb3b8f1d00ec Mon Sep 17 00:00:00 2001 From: Carlo Grisetti Date: Tue, 3 Nov 2020 10:57:43 +0100 Subject: [PATCH 2/7] Reflect TF 2.3.1 maximum versions Actually, even TF 2.3.1 specifies numpy<1.19.0 (and h5py<2.11.0), so I'm aligning the maximum versions here also. --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 48eb23aeac4..9076b990d8d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ Cython>=0.25 -h5py>=2.6 -numpy>=1.15,<=1.19.3 +h5py>=2.6,<2.11.0 +numpy>=1.15,<1.19.0 pandas>=0.19 scipy>=0.18 tabulate>=0.7 From e279ddfb6889e2019b8fe58c158e8a96ccf14140 Mon Sep 17 00:00:00 2001 From: Piero Molino Date: Thu, 5 Nov 2020 17:12:58 -0800 Subject: [PATCH 3/7] Incorporated comment --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9076b990d8d..7ea958c54c0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,7 @@ Cython>=0.25 h5py>=2.6,<2.11.0 -numpy>=1.15,<1.19.0 +numpy>=1.15 ; sys_platform != "Windows" +numpy>=1.15,<1.19.0 ; sys_platform == "Windows" pandas>=0.19 scipy>=0.18 tabulate>=0.7 From d1b215ed6ba2a2036bd889abed5b378c4d4c25b8 Mon Sep 17 00:00:00 2001 From: Piero Molino Date: Thu, 5 Nov 2020 17:14:27 -0800 Subject: [PATCH 4/7] Added platform check for hdf5py --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7ea958c54c0..154e6379fa6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,6 @@ Cython>=0.25 -h5py>=2.6,<2.11.0 +h5py>=2.6 ; sys_platform != "Windows" +h5py>=2.6,<2.11.0 ; sys_platform == "Windows" numpy>=1.15 ; sys_platform != "Windows" numpy>=1.15,<1.19.0 ; sys_platform == "Windows" pandas>=0.19 From b15dcc9d452f19a287bf9b077bea12ce8b6cdec4 Mon Sep 17 00:00:00 2001 From: Carlo Grisetti Date: Fri, 6 Nov 2020 15:47:29 +0100 Subject: [PATCH 5/7] Exclude neuropod from windows requirements PIP package not available for windows --- requirements_serve.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_serve.txt b/requirements_serve.txt index afb25fad73a..5b3ce47a625 100644 --- a/requirements_serve.txt +++ b/requirements_serve.txt @@ -2,4 +2,4 @@ uvicorn fastapi pydantic python-multipart -neuropod +neuropod ; sys_platform != "Windows" From b48ef69334e857b6fe316313e70f7df74a37aa51 Mon Sep 17 00:00:00 2001 From: Carlo Grisetti Date: Fri, 6 Nov 2020 15:53:44 +0100 Subject: [PATCH 6/7] Revert platform constraint for h5py and numpy --- requirements.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 154e6379fa6..9076b990d8d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,6 @@ Cython>=0.25 -h5py>=2.6 ; sys_platform != "Windows" -h5py>=2.6,<2.11.0 ; sys_platform == "Windows" -numpy>=1.15 ; sys_platform != "Windows" -numpy>=1.15,<1.19.0 ; sys_platform == "Windows" +h5py>=2.6,<2.11.0 +numpy>=1.15,<1.19.0 pandas>=0.19 scipy>=0.18 tabulate>=0.7 From c630ecad4c712c425e99131e85ec862435f1edc2 Mon Sep 17 00:00:00 2001 From: Carlo Grisetti Date: Fri, 6 Nov 2020 16:28:56 +0100 Subject: [PATCH 7/7] Fix requirements typo --- requirements_serve.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_serve.txt b/requirements_serve.txt index 5b3ce47a625..085a08e4ed0 100644 --- a/requirements_serve.txt +++ b/requirements_serve.txt @@ -2,4 +2,4 @@ uvicorn fastapi pydantic python-multipart -neuropod ; sys_platform != "Windows" +neuropod ; platform_system != "Windows"