Merge branch 'dev' into parallel_zarr_as_queue_attributes

hdmf-dev · Sep 29, 2023 · 04919f8 · 04919f8
2 parents aefdd2a + c262481
commit 04919f8
Show file tree

Hide file tree

Showing 17 changed files with 710 additions and 181 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -62,7 +62,6 @@ body:
     attributes:
       label: Python Version
       options:
-        - "3.7"
         - "3.8"
         - "3.9"
         - "3.10"

diff --git a/.github/workflows/run_all_tests.yml b/.github/workflows/run_all_tests.yml
@@ -22,24 +22,21 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { name: linux-python3.7-minimum      , test-tox-env: py37-minimum    , build-tox-env: build-py37-minimum    , python-ver: "3.7" , os: ubuntu-latest }
-          - { name: linux-python3.8              , test-tox-env: py38            , build-tox-env: build-py38            , python-ver: "3.8" , os: ubuntu-latest }
+          - { name: linux-python3.8-minimum      , test-tox-env: py38-minimum    , build-tox-env: build-py38-minimum    , python-ver: "3.8" , os: ubuntu-latest }
           - { name: linux-python3.9              , test-tox-env: py39            , build-tox-env: build-py39            , python-ver: "3.9" , os: ubuntu-latest }
           - { name: linux-python3.10             , test-tox-env: py310           , build-tox-env: build-py310           , python-ver: "3.10", os: ubuntu-latest }
           - { name: linux-python3.11             , test-tox-env: py311           , build-tox-env: build-py311           , python-ver: "3.11", os: ubuntu-latest }
           - { name: linux-python3.11-optional    , test-tox-env: py311-optional  , build-tox-env: build-py311-optional  , python-ver: "3.11", os: ubuntu-latest }
           - { name: linux-python3.11-upgraded    , test-tox-env: py311-upgraded  , build-tox-env: build-py311-upgraded  , python-ver: "3.11", os: ubuntu-latest }
           - { name: linux-python3.11-prerelease  , test-tox-env: py311-prerelease, build-tox-env: build-py311-prerelease, python-ver: "3.11", os: ubuntu-latest }
-          - { name: windows-python3.7-minimum    , test-tox-env: py37-minimum    , build-tox-env: build-py37-minimum    , python-ver: "3.7" , os: windows-latest }
-          - { name: windows-python3.8            , test-tox-env: py38            , build-tox-env: build-py38            , python-ver: "3.8" , os: windows-latest }
+          - { name: windows-python3.8-minimum    , test-tox-env: py38-minimum    , build-tox-env: build-py38-minimum    , python-ver: "3.8" , os: windows-latest }
           - { name: windows-python3.9            , test-tox-env: py39            , build-tox-env: build-py39            , python-ver: "3.9" , os: windows-latest }
           - { name: windows-python3.10           , test-tox-env: py310           , build-tox-env: build-py310           , python-ver: "3.10", os: windows-latest }
           - { name: windows-python3.11           , test-tox-env: py311           , build-tox-env: build-py311           , python-ver: "3.11", os: windows-latest }
           - { name: windows-python3.11-optional  , test-tox-env: py311-optional  , build-tox-env: build-py311-optional  , python-ver: "3.11", os: windows-latest }
           - { name: windows-python3.11-upgraded  , test-tox-env: py311-upgraded  , build-tox-env: build-py311-upgraded  , python-ver: "3.11", os: windows-latest }
           - { name: windows-python3.11-prerelease, test-tox-env: py311-prerelease, build-tox-env: build-py311-prerelease, python-ver: "3.11", os: windows-latest }
-          - { name: macos-python3.7-minimum      , test-tox-env: py37-minimum    , build-tox-env: build-py37-minimum    , python-ver: "3.7" , os: macos-latest }
-          - { name: macos-python3.8              , test-tox-env: py38            , build-tox-env: build-py38            , python-ver: "3.8" , os: macos-latest }
+          - { name: macos-python3.8-minimum      , test-tox-env: py38-minimum    , build-tox-env: build-py38-minimum    , python-ver: "3.8" , os: macos-latest }
           - { name: macos-python3.9              , test-tox-env: py39            , build-tox-env: build-py39            , python-ver: "3.9" , os: macos-latest }
           - { name: macos-python3.10             , test-tox-env: py310           , build-tox-env: build-py310           , python-ver: "3.10", os: macos-latest }
           - { name: macos-python3.11             , test-tox-env: py311           , build-tox-env: build-py311           , python-ver: "3.11", os: macos-latest }
@@ -88,13 +85,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { name: linux-gallery-python3.7-minimum      , test-tox-env: gallery-py37-minimum    , python-ver: "3.7" , os: ubuntu-latest }
+          - { name: linux-gallery-python3.8-minimum      , test-tox-env: gallery-py38-minimum    , python-ver: "3.8" , os: ubuntu-latest }
           - { name: linux-gallery-python3.11-upgraded    , test-tox-env: gallery-py311-upgraded  , python-ver: "3.11", os: ubuntu-latest }
           - { name: linux-gallery-python3.11-prerelease  , test-tox-env: gallery-py311-prerelease, python-ver: "3.11", os: ubuntu-latest }
-          - { name: windows-gallery-python3.7-minimum    , test-tox-env: gallery-py37-minimum    , python-ver: "3.7" , os: windows-latest }
+          - { name: windows-gallery-python3.8-minimum    , test-tox-env: gallery-py38-minimum    , python-ver: "3.8" , os: windows-latest }
           - { name: windows-gallery-python3.11-upgraded  , test-tox-env: gallery-py311-upgraded  , python-ver: "3.11", os: windows-latest }
           - { name: windows-gallery-python3.11-prerelease, test-tox-env: gallery-py311-prerelease, python-ver: "3.11", os: windows-latest }
-          - { name: macos-gallery-python3.7-minimum      , test-tox-env: gallery-py37-minimum    , python-ver: "3.7" , os: macos-latest }
+          - { name: macos-gallery-python3.8-minimum      , test-tox-env: gallery-py38-minimum    , python-ver: "3.8" , os: macos-latest }
           - { name: macos-gallery-python3.11-upgraded    , test-tox-env: gallery-py311-upgraded  , python-ver: "3.11", os: macos-latest }
           - { name: macos-gallery-python3.11-prerelease  , test-tox-env: gallery-py311-prerelease, python-ver: "3.11", os: macos-latest }
     steps:
@@ -132,8 +129,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { name: conda-linux-python3.7-minimum    , test-tox-env: py37-minimum    , build-tox-env: build-py37-minimum    , python-ver: "3.7" , os: ubuntu-latest }
-          - { name: conda-linux-python3.8            , test-tox-env: py38            , build-tox-env: build-py38            , python-ver: "3.8" , os: ubuntu-latest }
+          - { name: conda-linux-python3.8-minimum    , test-tox-env: py38-minimum    , build-tox-env: build-py38-minimum    , python-ver: "3.8" , os: ubuntu-latest }
           - { name: conda-linux-python3.9            , test-tox-env: py39            , build-tox-env: build-py39            , python-ver: "3.9" , os: ubuntu-latest }
           - { name: conda-linux-python3.10           , test-tox-env: py310           , build-tox-env: build-py310           , python-ver: "3.10", os: ubuntu-latest }
           - { name: conda-linux-python3.11           , test-tox-env: py311           , build-tox-env: build-py311           , python-ver: "3.11", os: ubuntu-latest }
@@ -162,8 +158,7 @@ jobs:
         run: |
           conda config --set always_yes yes --set changeps1 no
           conda info
-          # the conda dependency resolution for tox under python 3.7 can install the wrong importlib_metadata
-          conda install -c conda-forge tox "importlib_metadata>4"
+          conda install -c conda-forge tox
 
       - name: Conda reporting
         run: |

diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
@@ -19,13 +19,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { name: linux-python3.7-minimum      , test-tox-env: py37-minimum    , build-tox-env: build-py37-minimum    , python-ver: "3.7" , os: ubuntu-latest }
+          - { name: linux-python3.8-minimum      , test-tox-env: py38-minimum    , build-tox-env: build-py38-minimum    , python-ver: "3.8" , os: ubuntu-latest }
           - { name: linux-python3.11             , test-tox-env: py311           , build-tox-env: build-py311           , python-ver: "3.11", os: ubuntu-latest }
           # NOTE config below with "upload-wheels: true" specifies that wheels should be uploaded as an artifact
           - { name: linux-python3.11-upgraded    , test-tox-env: py311-upgraded  , build-tox-env: build-py311-upgraded  , python-ver: "3.11", os: ubuntu-latest , upload-wheels: true }
-          - { name: windows-python3.7-minimum    , test-tox-env: py37-minimum    , build-tox-env: build-py37-minimum    , python-ver: "3.7" , os: windows-latest }
+          - { name: windows-python3.8-minimum    , test-tox-env: py38-minimum    , build-tox-env: build-py38-minimum    , python-ver: "3.8" , os: windows-latest }
           - { name: windows-python3.11-upgraded  , test-tox-env: py311-upgraded  , build-tox-env: build-py311-upgraded  , python-ver: "3.11", os: windows-latest }
-          - { name: macos-python3.7-minimum      , test-tox-env: py37-minimum    , build-tox-env: build-py37-minimum    , python-ver: "3.7" , os: macos-latest }
+          - { name: macos-python3.8-minimum      , test-tox-env: py38-minimum    , build-tox-env: build-py38-minimum    , python-ver: "3.8" , os: macos-latest }
           - { name: macos-python3.11-upgraded    , test-tox-env: py311-upgraded  , build-tox-env: build-py311-upgraded  , python-ver: "3.11", os: macos-latest }
     steps:
       - name: Cancel non-latest runs
@@ -76,9 +76,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { name: linux-gallery-python3.7-minimum    , test-tox-env: gallery-py37-minimum  , python-ver: "3.7" , os: ubuntu-latest }
+          - { name: linux-gallery-python3.8-minimum    , test-tox-env: gallery-py38-minimum  , python-ver: "3.8" , os: ubuntu-latest }
           - { name: linux-gallery-python3.11-upgraded  , test-tox-env: gallery-py311-upgraded, python-ver: "3.11", os: ubuntu-latest }
-          - { name: windows-gallery-python3.7-minimum  , test-tox-env: gallery-py37-minimum  , python-ver: "3.7" , os: windows-latest }
+          - { name: windows-gallery-python3.8-minimum  , test-tox-env: gallery-py38-minimum  , python-ver: "3.8" , os: windows-latest }
           - { name: windows-gallery-python3.11-upgraded, test-tox-env: gallery-py311-upgraded, python-ver: "3.11", os: windows-latest }
     steps:
       - name: Cancel non-latest runs
@@ -114,7 +114,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { name: conda-linux-python3.7-minimum    , test-tox-env: py37-minimum    , build-tox-env: build-py37-minimum    , python-ver: "3.7" , os: ubuntu-latest }
+          - { name: conda-linux-python3.8-minimum    , test-tox-env: py38-minimum    , build-tox-env: build-py38-minimum    , python-ver: "3.8" , os: ubuntu-latest }
           - { name: conda-linux-python3.11-upgraded  , test-tox-env: py311-upgraded  , build-tox-env: build-py311-upgraded  , python-ver: "3.11", os: ubuntu-latest }
     steps:
       - name: Cancel non-latest runs

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -8,7 +8,7 @@ version: 2
 build:
   os: ubuntu-20.04
   tools:
-    python: '3.10'
+    python: '3.9'
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
@@ -27,6 +27,7 @@ python:
     - requirements: requirements-doc.txt
     - requirements: requirements.txt
     - requirements: requirements-opt.txt
+    - path: . # path to the package relative to the root
 
 # Optionally include all submodules
 submodules:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # HDMF-ZARR Changelog
 
-## 0.3.1 (Upcoming)
+## 0.4.0 (Upcoming)
+
+### Enhancements
+* Enhanced ZarrIO to resolve object references lazily on read similar to HDMF's `HDF5IO` backend @mavaylon1 [#120](https://github.com/hdmf-dev/hdmf-zarr/pull/120)
+
+### Dependencies
+* Updated HDMF and PyNWB version to the most recent release @mavaylon1 [#120](https://github.com/hdmf-dev/hdmf-zarr/pull/120)
+* Updated minimum Python version from 3.7 to 3.8 @mavaylon1 [#120](https://github.com/hdmf-dev/hdmf-zarr/pull/120)
 
 ### Bug fixes
 * Fixed error in deploy workflow. @mavaylon1 [#109](https://github.com/hdmf-dev/hdmf-zarr/pull/109)

diff --git a/docs/gallery/plot_convert_nwb_hdf5.py b/docs/gallery/plot_convert_nwb_hdf5.py
@@ -9,7 +9,6 @@
 :py:class:`~ hdmf.backends.hdf5.h5tools.HDF5IO`  HDF5 backend from HDMF for storage.
 """
 
-
 ###############################################################################
 # Setup
 # -----
@@ -31,11 +30,14 @@
 #    asset.download(filename)
 #
 # We here use a local copy of a small file from this DANDIset as an example:
-#
+
 
 # sphinx_gallery_thumbnail_path = 'figures/gallery_thumbnail_plot_convert_nwb.png'
 import os
 import shutil
+from pynwb import NWBHDF5IO
+from hdmf_zarr.nwb import NWBZarrIO
+from contextlib import suppress
 
 # Input file to convert
 basedir = "resources"
@@ -62,9 +64,6 @@
 # As this is an NWB file, we here use the :py:class:`pynwb.NWBHDF5IO` backend for reading the file from
 # from HDF5 and use the :py:class:`~hdmf_zarr.nwb.NWBZarrIO` backend to export the file to Zarr.
 
-from pynwb import NWBHDF5IO
-from hdmf_zarr.nwb import NWBZarrIO
-
 with NWBHDF5IO(filename, 'r', load_namespaces=False) as read_io:  # Create HDF5 IO object for read
     with NWBZarrIO(zarr_filename, mode='w') as export_io:         # Create Zarr IO object for write
         export_io.export(src_io=read_io, write_args=dict(link_data=False))   # Export from HDF5 to Zarr
@@ -77,7 +76,6 @@
 #
 # Read the Zarr file back in
 # --------------------------
-#
 
 zr = NWBZarrIO(zarr_filename, 'r')
 zf = zr.read()
@@ -107,9 +105,10 @@
 #
 # Using the same approach as above, we can now convert our Zarr file back to HDF5.
 
-with NWBZarrIO(zarr_filename, mode='r') as read_io:  # Create Zarr IO object for read
-    with NWBHDF5IO(hdf_filename, 'w') as export_io:  # Create HDF5 IO object for write
-        export_io.export(src_io=read_io, write_args=dict(link_data=False))  # Export from Zarr to HDF5
+with suppress(Exception):  # TODO: This is a temporary ignore on the convert_dtype exception.
+    with NWBZarrIO(zarr_filename, mode='r') as read_io:  # Create Zarr IO object for read
+        with NWBHDF5IO(hdf_filename, 'w') as export_io:  # Create HDF5 IO object for write
+            export_io.export(src_io=read_io, write_args=dict(link_data=False))  # Export from Zarr to HDF5
 
 ###############################################################################
 # Read the new HDF5 file back
@@ -118,5 +117,6 @@
 # Now our file has been converted from HDF5 to Zarr and back again to HDF5.
 # Here we check that we can still read that file.
 
-with NWBHDF5IO(hdf_filename, 'r') as hr:
-    hf = hr.read()
+with suppress(Exception):  # TODO: This is a temporary ignore on the convert_dtype exception.
+    with NWBHDF5IO(hdf_filename, 'r') as hr:
+        hf = hr.read()
diff --git a/docs/source/storage.rst b/docs/source/storage.rst
@@ -296,7 +296,11 @@ store the definition of the ``region`` that is being referenced, e.g., a slice o
     4) :py:meth:`~hdmf_zarr.backend.ZarrIO.__read_dataset` to support reading region references,
     which may also require updates to :py:meth:`~hdmf_zarr.backend.ZarrIO.__parse_ref` and
     :py:meth:`~hdmf_zarr.backend.ZarrIO.__resolve_ref`, and
-    5) and possibly other parts of :py:class:`~hdmf_zarr.backend.ZarrIO`
+    5) and possibly other parts of :py:class:`~hdmf_zarr.backend.ZarrIO`.
+    6) The py:class:`~hdmf_zarr.zarr_utils.ContainerZarrRegionDataset` and
+    py:class:`~hdmf_zarr.zarr_utils.ContainerZarrRegionDataset` classes will also need to be finalized
+    to support region references.
+
 
 .. _sec-zarr-storage-dtypes:
 
@@ -379,7 +383,3 @@ data type. The specification of the namespace is stored in
 ``/specifications/<namespace-name>/<version>/<source-filename>``. Here ``<source-filename>`` refers to the main name
 of the source-file without file extension (e.g., the core namespace defines ``nwb.ephys.yaml`` as source which would
 be stored in ``/specifications/core/2.0.1/nwb.ecephys``).
-
-
-
-
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.black]
 line-length = 120
-target-version = ['py37']
+target-version = ['py38']
 include = '\.pyi?$'
 extend-exclude = '''
 /(

diff --git a/requirements-min.txt b/requirements-min.txt
@@ -1,7 +1,7 @@
-hdmf==3.5.4
+hdmf==3.9.0
 zarr==2.11.0
 numcodecs==0.9.1
-pynwb==2.3.2
+pynwb==2.5.0
 setuptools
 importlib_resources;python_version<'3.9' # Remove when python 3.9 becomes the new minimum
 threadpoolctl==3.1.0
diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 # pinned dependencies to reproduce an entire development environment to use HDMF-ZARR
-hdmf==3.5.4
+hdmf==3.9.0
 zarr==2.11.0
-pynwb==2.3.2
+pynwb==2.5.0
 numpy==1.21; python_version < "3.8"
 numpy==1.23; python_version >= "3.8"
 numcodecs==0.10.2; python_version < "3.8"

diff --git a/setup.py b/setup.py
@@ -17,14 +17,12 @@
 
 
 reqs = [
-    'hdmf==3.5.4',  # temporary
+    'hdmf>=3.9.0',
     'zarr>=2.11.0',
-    'numpy<1.22; python_version < "3.8"',
-    'numpy>=1.22; python_version >= "3.8"',
+    'numpy>=1.24',
     'numcodecs>=0.9.1',
-    'numcodecs==0.10.2; python_version < "3.8"',
-    'numcodecs==0.11.0; python_version >= "3.8"',
-    'pynwb>=2.3.2',
+    'numcodecs==0.11.0',
+    'pynwb>=2.5.0',
     'setuptools',
     'threadpoolctl>=3.1.0',
 ]
@@ -47,10 +45,9 @@
     'packages': pkgs,
     'package_dir': {'': 'src'},
     'package_data': {},
-    'python_requires': '>=3.7',
+    'python_requires': '>=3.8',
     'classifiers': [
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",