Skip to content

Commit

Permalink
Merge branch 'nwb_schema_2.8.0' into deprecate_event_waveform
Browse files Browse the repository at this point in the history
  • Loading branch information
rly committed Nov 19, 2024
2 parents 80f03f4 + b955b92 commit f59fb8f
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 16 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

### Enhancements and minor changes
* Added `NWBHDF5IO.read_nwb` convenience method to simplify reading an NWB file. @h-mayorquin [#1979](https://github.com/NeurodataWithoutBorders/pynwb/pull/1979)
* Removed unused references to region references and builders in preparation for changes in HDMF 4.0. @rly [#1991](https://github.com/NeurodataWithoutBorders/pynwb/pull/1991)

### Documentation and tutorial enhancements
- Added documentation example for `SpikeEventSeries`. @stephprince [#1983](https://github.com/NeurodataWithoutBorders/pynwb/pull/1983)
Expand Down
2 changes: 1 addition & 1 deletion docs/source/overview_software_architecture.rst
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Builder
* :py:class:`~hdmf.build.builders.GroupBuilder` - represents a collection of objects
* :py:class:`~hdmf.build.builders.DatasetBuilder` - represents data
* :py:class:`~hdmf.build.builders.LinkBuilder` - represents soft-links
* :py:class:`~hdmf.build.builders.RegionBuilder` - represents a slice into data (Subclass of :py:class:`~hdmf.build.builders.DatasetBuilder`)
* :py:class:`~hdmf.build.builders.ReferenceBuilder` - represents a reference to another group or dataset

* **Main Module:** :py:mod:`hdmf.build.builders`

Expand Down
2 changes: 1 addition & 1 deletion requirements-opt.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ oaklib==0.5.32; python_version >= "3.9"
# for streaming tests
fsspec==2024.10.0
requests==2.32.3
aiohttp==3.10.10
aiohttp==3.10.11
15 changes: 1 addition & 14 deletions src/pynwb/io/core.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from hdmf.build import ObjectMapper, RegionBuilder
from hdmf.build import ObjectMapper
from hdmf.common import VectorData
from hdmf.utils import getargs, docval
from hdmf.spec import AttributeSpec
Expand Down Expand Up @@ -40,19 +40,6 @@ def __init__(self, spec):
self.map_spec('description', spec.get_attribute('notes'))


class NWBTableRegionMap(NWBDataMap):

@ObjectMapper.constructor_arg('table')
def carg_table(self, builder, manager):
return manager.construct(builder.data.builder)

@ObjectMapper.constructor_arg('region')
def carg_region(self, builder, manager):
if not isinstance(builder.data, RegionBuilder):
raise ValueError("'builder' must be a RegionBuilder")
return builder.data.region


@register_map(VectorData)
class VectorDataMap(ObjectMapper):

Expand Down

0 comments on commit f59fb8f

Please sign in to comment.