Skip to content

Commit 34c4240

Browse files
authored
Merge pull request #251 from NeurodataWithoutBorders/docutils/update
Docutils/update
2 parents af6fe5b + f7cd915 commit 34c4240

File tree

4 files changed

+54
-13
lines changed

4 files changed

+54
-13
lines changed

core/nwb.namespace.yaml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,36 @@ namespaces:
1414
full_name: NWB core
1515
schema:
1616
- source: nwb.base.yaml
17+
title: Base data types
18+
doc: This source module contains base data types used throughout the NWB:N data format.
1719
- source: nwb.epoch.yaml
20+
title: Epochs
21+
doc: This source module contains neurodata_types for epoch data.
1822
- source: nwb.image.yaml
23+
title: Image data
24+
doc: This source module contains neurodata_types for image data.
1925
- source: nwb.file.yaml
26+
title: NWB:N file
27+
doc: Main NWB:N file specification.
2028
- source: nwb.misc.yaml
29+
title: Miscellaneous neurodata_types.
30+
doc: Miscellaneous types.
2131
- source: nwb.behavior.yaml
32+
title: Behavior
33+
doc: This source module contains neurodata_types for behavior data.
2234
- source: nwb.ecephys.yaml
35+
title: Extracellular electrophysiology
36+
doc: This source module contains neurodata_types for extracellular electrophysiology data.
2337
- source: nwb.icephys.yaml
38+
title: Intracellular electrophysiology
39+
doc: This source module contains neurodata_types for intracellular electrophysiology data.
2440
- source: nwb.ogen.yaml
41+
title: Optogenetics
42+
doc: This source module contains neurodata_types for opto-genetics data.
2543
- source: nwb.ophys.yaml
44+
title: Optical physiology
45+
doc: This source module contains neurodata_types for optical physiology data.
2646
- source: nwb.retinotopy.yaml
27-
version: 2.0.0
47+
title: Retinotopy
48+
doc: This source module contains neurodata_type for retinotopy data.
49+
version: 2.0.1

docs/format/source/conf_doc_autogen.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,10 @@
4747
# Should the YAML sources be included for the different modules
4848
spec_show_yaml_src = True
4949

50-
# Should the JSON sources be included for the different modules
51-
spec_show_json_src = False
52-
5350
# Show figure of the hierarchy of objects defined by the spec
5451
spec_show_hierarchy_plots = True
5552

56-
# Should the sources of the neurodata_types (JSON/YAML) be rendered in a separate section (True) or
53+
# Should the sources of the neurodata_types (YAML) be rendered in a separate section (True) or
5754
# in the same location as the base documentation
5855
spec_generate_src_file = True
5956

@@ -82,3 +79,15 @@
8279
# Resolve includes to always show the full list of objects that are part of a type (True)
8380
# or to show only the parts that are actually new to a current type while only linking to base types
8481
spec_resolve_type_inc = False
82+
83+
# Default type map to be used. This is the type map where dependent namespaces are stored. In the case of
84+
# NWB this is spec_default_type_map = pynwb.get_type_map()
85+
import pynwb
86+
spec_default_type_map = pynwb.get_type_map()
87+
88+
# Default specification classes for groups datasets and namespaces. In the case of NWB these are the NWB-specfic
89+
# spec classes. In the general cases these are the spec classes from HDMF
90+
spec_group_spec_cls = pynwb.spec.NWBGroupSpec
91+
spec_dataset_spec_cls = pynwb.spec.NWBDatasetSpec
92+
spec_namespace_spec_cls = pynwb.spec.NWBNamespace
93+

docs/format/source/format_description.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,6 @@ processing modules, a default name (usually the same as the neurodata_type) is
154154
commonly specified to further ease identification of the data in a file. However, to
155155
support storage of multiple instances of the same subtype in the
156156
same processing module, NWB:N allows users to optionally define custom names as well.
157-
A detailed overview of the main data processing containers is available in
158-
:numref:`Data_Processing`.
159157

160158

161159
.. _sec-extending-the-format:
@@ -197,8 +195,8 @@ electrical versus optical physiology) as well as new modalities (e.g.,
197195
video tracking of whisker positions). When a neurodata_type inherits from *TimeSeries*,
198196
new data objects (i.e., datasets, attributes, groups, and links)
199197
can be added while all objects of the parent *TimeSeries* type are
200-
inherited and, hence, part of the new neurodata_type. Section :numref:`TimeSeries_Types`
201-
provides detailed definitions for all core *TimeSeries* types.
198+
inherited and, hence, part of the new neurodata_type. Section :numref:`sec-TimeSeries`
199+
includes a list of all *TimeSeries* types.
202200

203201
Extending *NWBContainer* works in the same way, e.g., to create more specific types for
204202
data processing.

docs/format/source/format_release_notes.rst

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,24 @@
11
Release Notes
22
=============
33

4-
2.0.0 Beta (2017/18)
5-
--------------------
4+
2.0.1 (March 2019)
5+
------------------
66

7-
**First release:** November 2017
7+
**Change:** Added ``doc`` and ``title`` descriptions for the individual source files included in the main namespace.
8+
9+
**Reason:** Enhance documentation of the namespace and facilitate presentation of types in autogenerated docs by
10+
making it easier to sort ``neurodata_types`` into meaningful categories (i.e., sections) with approbriate tiles and
11+
descriptions.
12+
13+
**Backwards compatibility:** No changes to the actual specification fo the format are made. 2.0.1 is fully compatible
14+
with 2.0.0.
15+
16+
17+
2.0.0 (January 2019)
18+
---------------------
19+
20+
**Main release:** November 2017 (Beta), November 2018 (RC), January 2019 (final)
821

9-
**Subsequent releases:** The schema was improved and updated throughout the beta phase with full release planed for fall 2018.
1022

1123
Added new base data types: ``NWBContainer``, ``NWBData``, ``NWBDataInterface``
1224
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)