From 086c9bc0078b6defde7987672cddf91f4b4f1c95 Mon Sep 17 00:00:00 2001 From: Matthew Avaylon Date: Fri, 18 Aug 2023 20:47:32 -0700 Subject: [PATCH 1/2] Update release.md (#107) --- .github/PULL_REQUEST_TEMPLATE/release.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE/release.md b/.github/PULL_REQUEST_TEMPLATE/release.md index 13893a09..a26798e0 100644 --- a/.github/PULL_REQUEST_TEMPLATE/release.md +++ b/.github/PULL_REQUEST_TEMPLATE/release.md @@ -1,4 +1,4 @@ -Prepare for release of HDMF [version] +Prepare for release of HDMF-Zarr [version] ### Before merging: - [ ] Major and minor releases: Update package versions in `requirements.txt`, `requirements-dev.txt`, @@ -21,4 +21,4 @@ Prepare for release of HDMF [version] [GitHub releases page](https://github.com/hdmf-dev/hdmf-zarr/releases) with the changelog 3. Check that the readthedocs "latest" and "stable" builds run and succeed 4. Update [conda-forge/hdmf_zarr-feedstock](https://github.com/conda-forge/hdmf_zarr-feedstock) with the latest version number - and SHA256 retrieved from PyPI > HDMF > Download Files > View hashes for the `.tar.gz` file. Re-render as needed + and SHA256 retrieved from PyPI > HDMF-Zarr > Download Files > View hashes for the `.tar.gz` file. Re-render as needed From 6c13e14927eea985d53174d8580224c97d65707a Mon Sep 17 00:00:00 2001 From: Matthew Avaylon Date: Tue, 22 Aug 2023 10:50:17 -0700 Subject: [PATCH 2/2] numpy degrade for python 3.7 (#115) * numpy degrade for python 3.7 * Update setup.py * Update setup.py * Update requirements.txt * Update requirements.txt * Update CHANGELOG.md * Update CHANGELOG.md * Update requirements.txt * Update setup.py * Update requirements.txt * Update setup.py * Update setup.py --- CHANGELOG.md | 1 + requirements.txt | 6 ++++-- setup.py | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77f9d529..087b91bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Bug fixes * Fixed error in deploy workflow. @mavaylon1 [#109](https://github.com/hdmf-dev/hdmf-zarr/pull/109) +* Fixed build error for ReadtheDocs by degrading numpy for python 3.7 support. @mavaylon1 [#115](https://github.com/hdmf-dev/hdmf-zarr/pull/115) ## 0.3.0 (July 21, 2023) diff --git a/requirements.txt b/requirements.txt index 6c5f1020..20a92d6d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,5 +2,7 @@ hdmf==3.5.4 zarr==2.11.0 pynwb==2.3.2 -numpy==1.23.5 -numcodecs==0.11.0 +numpy==1.21; python_version < "3.8" +numpy==1.23; python_version >= "3.8" +numcodecs==0.10.2; python_version < "3.8" +numcodecs==0.11.0; python_version >= "3.8" diff --git a/setup.py b/setup.py index 254bd0f5..5b155ecb 100755 --- a/setup.py +++ b/setup.py @@ -19,8 +19,11 @@ reqs = [ 'hdmf==3.5.4', # temporary 'zarr>=2.11.0', - 'numpy>=1.22, <1.24; python_version>"3.7"', + 'numpy<1.22; python_version < "3.8"', + 'numpy>=1.22; python_version >= "3.8"', 'numcodecs>=0.9.1', + 'numcodecs==0.10.2; python_version < "3.8"', + 'numcodecs==0.11.0; python_version >= "3.8"', 'pynwb>=2.3.2', 'setuptools', ]