From 1cab8ddb2cd98ed10f3ac8393a5315784788b276 Mon Sep 17 00:00:00 2001 From: Ryan Ly Date: Fri, 23 Apr 2021 10:47:30 -0700 Subject: [PATCH 1/3] Pin HDMF to 2.5.1 --- requirements-min.txt | 6 +++--- setup.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements-min.txt b/requirements-min.txt index 30262c63b..bd8b36d31 100644 --- a/requirements-min.txt +++ b/requirements-min.txt @@ -1,7 +1,7 @@ -# package dependencies and their minimum versions for installing PyNWB (note that HDMF has a range of requirements) -# the requirements here specify '==' for testing; setup.py replaces '==' with '>=' +# package dependencies and their minimum versions for installing PyNWB +# the requirements here specify '==' for testing; setup.py replaces '==' with '>=', except HDMF has fixed requirements h5py==2.9,<3 # support for setting attrs to lists of utf-8 added in 2.9 -hdmf==2.5.1,<3 +hdmf==2.5.1 numpy==1.16,<1.21 pandas==0.23,<2 python-dateutil==2.7,<3 diff --git a/setup.py b/setup.py index 5a2dcce91..e86f82e46 100755 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ with open('requirements-min.txt', 'r') as fp: # replace == with >= and remove trailing comments and spaces - reqs = [x.replace('==', '>=').split('#')[0].strip() for x in fp] + reqs = [x.replace('==', '>=').split('#')[0].strip() for x in fp if not x.startswith('hdmf')] reqs = [x for x in reqs if x] # remove empty strings print(reqs) From c7dd9a605fe099dfeec8345b31f3fb9b32a8a6fa Mon Sep 17 00:00:00 2001 From: Ryan Ly Date: Tue, 11 May 2021 12:03:24 -0700 Subject: [PATCH 2/3] use HDMF 2.5.2 and setuptools, unpin HDMF and allow range --- requirements-min.txt | 3 ++- requirements.txt | 3 ++- setup.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/requirements-min.txt b/requirements-min.txt index bd8b36d31..cfbfb922c 100644 --- a/requirements-min.txt +++ b/requirements-min.txt @@ -1,7 +1,8 @@ # package dependencies and their minimum versions for installing PyNWB # the requirements here specify '==' for testing; setup.py replaces '==' with '>=', except HDMF has fixed requirements h5py==2.9,<3 # support for setting attrs to lists of utf-8 added in 2.9 -hdmf==2.5.1 +hdmf==2.5.2,<3 numpy==1.16,<1.21 pandas==0.23,<2 python-dateutil==2.7,<3 +setuptools diff --git a/requirements.txt b/requirements.txt index 74336520a..bd11df87c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,6 @@ h5py==2.10.0 -hdmf==2.5.1 +hdmf==2.5.2 numpy==1.18.5 pandas==0.25.3 python-dateutil==2.8.1 +setuptools==56.0.0 diff --git a/setup.py b/setup.py index e86f82e46..5a2dcce91 100755 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ with open('requirements-min.txt', 'r') as fp: # replace == with >= and remove trailing comments and spaces - reqs = [x.replace('==', '>=').split('#')[0].strip() for x in fp if not x.startswith('hdmf')] + reqs = [x.replace('==', '>=').split('#')[0].strip() for x in fp] reqs = [x for x in reqs if x] # remove empty strings print(reqs) From e4c1f3d12772111f97bd65db07fe4f7cace3d754 Mon Sep 17 00:00:00 2001 From: Ryan Ly Date: Tue, 11 May 2021 13:21:44 -0700 Subject: [PATCH 3/3] Update requirements-min.txt --- requirements-min.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-min.txt b/requirements-min.txt index cfbfb922c..85531eaf5 100644 --- a/requirements-min.txt +++ b/requirements-min.txt @@ -1,5 +1,5 @@ # package dependencies and their minimum versions for installing PyNWB -# the requirements here specify '==' for testing; setup.py replaces '==' with '>=', except HDMF has fixed requirements +# the requirements here specify '==' for testing; setup.py replaces '==' with '>=' h5py==2.9,<3 # support for setting attrs to lists of utf-8 added in 2.9 hdmf==2.5.2,<3 numpy==1.16,<1.21