Merge branch 'dev' into common_schema

NeurodataWithoutBorders · Feb 6, 2024 · c487a32 · c487a32
2 parents a8f163f + 10d2fc2
commit c487a32
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/core/nwb.file.yaml b/core/nwb.file.yaml
@@ -131,6 +131,16 @@ groups:
       - neurodata_type_inc: TimeSeries
         doc: TimeSeries objects containing data of presented stimuli.
         quantity: '*'
+      - neurodata_type_inc: NWBDataInterface
+        doc: 'Generic NWB data interfaces, usually from an extension,
+          containing data of presented stimuli.'
+        quantity: '*'
+      - neurodata_type_inc: DynamicTable
+        doc: DynamicTable objects containing data of presented stimuli.
+        quantity: '*'
+      # even though TimeSeries is a child type of NWBDataInterface, we do not remove TimeSeries
+      # in order to maintain backwards compatibility in the APIs that
+      # use the neurodata_type_inc from the schema to set the variable name
     - name: templates
       doc: 'Template stimuli. Timestamps in templates are based on stimulus
         design and are relative to the beginning of the stimulus. When templates are

diff --git a/docs/format/source/format_release_notes.rst b/docs/format/source/format_release_notes.rst
@@ -9,9 +9,10 @@ Release Notes
 Minor changes
 ^^^^^^^^^^^^^
 - Fixed typos in docstrings. (#560)
-- Deprecated `ImagingRetinotopy` neurodata type. (#565)
-- Modified `OptogeneticSeries` to allow 2D data, primarily in extensions of `OptogeneticSeries`. (#564)
+- Deprecated ``ImagingRetinotopy`` neurodata type. (#565)
+- Modified ``OptogeneticSeries`` to allow 2D data, primarily in extensions of ``OptogeneticSeries``. (#564)
 - Added optional ``stimulus_template`` column to ``IntracellularStimuliTable`` as part of the ``IntracellularRecordingsTable``. (#545)
+- Added support for ``NWBDataInterface`` and ``DynamicTable`` in ``NWBFile.stimulus``. (#559)
 
 2.6.0 (January 17, 2023)
 -----------------------