Skip to content

Commit

Permalink
Merge branch 'dev' into release-3.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
stephprince authored Jan 9, 2025
2 parents 65ce92a + b84b04a commit fc2997e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 19 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@

### Documentation and tutorial enhancements
- Updated `SpikeEventSeries`, `DecompositionSeries`, and `FilteredEphys` examples. @stephprince [#2012](https://github.com/NeurodataWithoutBorders/pynwb/pull/2012)
- Replaced deprecated `scipy.misc.face` dataset in the images tutorial with another example. @stephprince [#2016](https://github.com/NeurodataWithoutBorders/pynwb/pull/2016)


## PyNWB 2.8.3 (November 19, 2024)
Expand Down
20 changes: 2 additions & 18 deletions docs/gallery/domain/images.py
Original file line number Diff line number Diff line change
Expand Up @@ -296,30 +296,14 @@
# :py:class:`~pynwb.image.IndexSeries` that indexes into the
# :py:class:`~pynwb.base.Images`.

from scipy import datasets

from pynwb.base import ImageReferences
from pynwb.image import GrayscaleImage, Images, IndexSeries, RGBImage

gs_face = GrayscaleImage(
name="gs_face",
data=datasets.face(gray=True),
description="Grayscale version of a raccoon.",
resolution=35.433071,
)

rgb_face = RGBImage(
name="rgb_face",
data=datasets.face(),
resolution=70.0,
description="RGB version of a raccoon.",
)

images = Images(
name="raccoons",
images=[rgb_face, gs_face],
images=[rgb_logo, gs_logo],
description="A collection of raccoons.",
order_of_images=ImageReferences("order_of_images", [rgb_face, gs_face]),
order_of_images=ImageReferences("order_of_images", [rgb_logo, gs_logo]),
)

idx_series = IndexSeries(
Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ def __call__(self, filename):
'fsspec': ("https://filesystem-spec.readthedocs.io/en/latest/", None),
'nwbwidgets': ("https://nwb-widgets.readthedocs.io/en/latest/", None),
'nwb-overview': ("https://nwb-overview.readthedocs.io/en/latest/", None),
'zarr': ("https://zarr.readthedocs.io/en/stable/", None),
'zarr': ("https://zarr.readthedocs.io/en/v2.18.4/", None), # TODO - update when hdmf-zarr supports Zarr 3.0
'hdmf-zarr': ("https://hdmf-zarr.readthedocs.io/en/stable/", None),
'numcodecs': ("https://numcodecs.readthedocs.io/en/latest/", None),
}
Expand Down

0 comments on commit fc2997e

Please sign in to comment.