Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/hdmf-dev/hdmf-zarr into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
mavaylon1 committed Sep 13, 2023
2 parents a3af027 + 6c13e14 commit f7669dc
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE/release.md
Original file line number Diff line number Diff line change
@@ -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`,
Expand All @@ -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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 4 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
5 changes: 4 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
]
Expand Down

0 comments on commit f7669dc

Please sign in to comment.