Merge branch 'fix/numpy_py38' of https://github.com/hdmf-dev/hdmf int…

…o fix/numpy_py38
hdmf-dev · Jan 9, 2020 · 7831820 · 7831820
2 parents 74c0a4a + 7e37201
commit 7831820
Show file tree

Hide file tree

Showing 5 changed files with 797 additions and 790 deletions.
diff --git a/docs/source/overview_software_architecture.rst b/docs/source/overview_software_architecture.rst
@@ -123,7 +123,7 @@ ObjectMapper
    * Given a `Builder`_, return a Container representation
    * Given a `Container`_, return a Builder representation
 
-* **Main Module:** :py:class:`hdmf.build.map`
+* **Main Module:** :py:class:`hdmf.build.objectmapper`
 
 .. _fig-software-architecture-mainconcepts:
 
@@ -162,7 +162,7 @@ TypeMap
 
 * HDMF has one of these classes:
 
-   * the base class (i.e. :py:class:`~hdmf.build.map.TypeMap`)
+   * the base class (i.e. :py:class:`~hdmf.build.manager.TypeMap`)
 
 * TypeMaps can be merged, which is useful when combining extensions
 
@@ -172,7 +172,7 @@ BuildManager
 
 * Responsible for `memoizing <https://en.wikipedia.org/wiki/Memoization>`_ `Builder`_ and `Container`_
 * Constructed from a `TypeMap`_
-* HDMF only has one of these: :py:class:`hdmf.build.map.BuildManager`
+* HDMF only has one of these: :py:class:`hdmf.build.manager.BuildManager`
 
 .. _fig-software-architecture-buildmanager:
 

diff --git a/src/hdmf/build/__init__.py b/src/hdmf/build/__init__.py
@@ -7,5 +7,5 @@
 
 from .objectmapper import ObjectMapper
 
-from .map import BuildManager
-from .map import TypeMap
+from .manager import BuildManager
+from .manager import TypeMap