Merge branch 'dev' into add_unique_electrode_id_check

NeurodataWithoutBorders · Jun 25, 2021 · 3ef9779 · 3ef9779
2 parents 66837d5 + 51cc8f7
commit 3ef9779
Show file tree

Hide file tree

Showing 15 changed files with 874 additions and 632 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,12 @@
 
 ## PyNWB 1.6.0 (TBD, 2021)
 
+## Minor new features:
+- Add RRID for citing PyNWB to the docs. @oruebel (#1372)
+
 ## Bug fix:
-- Enforce electrode ID uniqueness during insertion into table
+- Enforce electrode ID uniqueness during insertion into table. @CodyCBakerPhD (#1344)
+
 
 ## PyNWB 1.5.1 (May 24, 2021)
 
@@ -50,7 +54,7 @@
   - Add capability to add a row to a column after IO.
   - Add method `AbstractContainer.get_fields_conf`.
   - Add functionality for storing external resource references.
-  - Add method `hdmf.utils.get_docval_macro` to get a tuple of the current values for a docval_macro, e.g., 'array_data'  
+  - Add method `hdmf.utils.get_docval_macro` to get a tuple of the current values for a docval_macro, e.g., 'array_data'
     and 'scalar_data'.
   - `DynamicTable` can be automatically generated using `get_class`. Now the HDMF API can read files with extensions
     that contain a DynamicTable without needing to import the extension first.

diff --git a/README.rst b/README.rst
@@ -88,7 +88,8 @@ For details on how to contribute to PyNWB see our `contribution guidelines <docs
 Citing NWB
 ==========
 
-Oliver Rübel, Andrew Tritt, Ryan Ly, Benjamin K. Dichter, Satrajit Ghosh, Lawrence Niu, Ivan Soltesz, Karel Svoboda, Loren Frank, Kristofer E. Bouchard, "The Neurodata Without Borders ecosystem for neurophysiological data science", bioRxiv 2021.03.13.435173, March 15, 2021, doi: https://doi.org/10.1101/2021.03.13.435173
+* **Manuscript:** Oliver Rübel, Andrew Tritt, Ryan Ly, Benjamin K. Dichter, Satrajit Ghosh, Lawrence Niu, Ivan Soltesz, Karel Svoboda, Loren Frank, Kristofer E. Bouchard, "The Neurodata Without Borders ecosystem for neurophysiological data science", bioRxiv 2021.03.13.435173, March 15, 2021, doi: https://doi.org/10.1101/2021.03.13.435173
+* **RRID:** (PyNWB, RRID:SCR_017452)
 
 LICENSE
 =======

diff --git a/docs/source/building_api.rst b/docs/source/building_api.rst