in progress

src/hdmf/build/manager.py

@@ -5,7 +5,6 @@
 from .builders import DatasetBuilder, GroupBuilder, LinkBuilder, Builder, BaseBuilder
 from .classgenerator import ClassGenerator, CustomClassGenerator, MCIClassGenerator
 from ..container import AbstractContainer, Container, Data
-from ..common import get_type_map()
 from ..term_set import TermSetConfigurator
 from ..spec import DatasetSpec, GroupSpec, NamespaceCatalog
 from ..spec.spec import BaseStorageSpec
@@ -735,7 +734,8 @@ def register_container_type(self, **kwargs):
         self.__container_types.setdefault(namespace, dict())
         self.__container_types[namespace][data_type] = container_cls
         self.__data_types.setdefault(container_cls, (namespace, data_type))
-        container_cls.__type_map = get_type_map()
+        # from hdmf.common import get_type_map # circular import
+        # container_cls.type_map = get_type_map()
         if not isinstance(container_cls, TypeSource):
             setattr(container_cls, spec.type_key(), data_type)
             setattr(container_cls, 'namespace', namespace)

src/hdmf/common/__init__.py

@@ -21,7 +21,6 @@
 global __TYPE_MAP
 
 @docval({'name': 'config_path', 'type': str, 'doc': 'Path to the configuration file.'},
-        {'name': 'return_map', 'type': bool, 'doc': 'Bool to return type_map', 'default': False},
         is_method=False)
 def load_termset_config(**kwargs):
     """
@@ -30,9 +29,6 @@ def load_termset_config(**kwargs):
     config_path, return_map = kwargs['config_path'], kwargs['return_map']
     __TYPE_MAP.ts_config.load_termset_config(config_path)
 
-    if return_map: # This helps with testing
-        return __TYPE_MAP
-
 def get_loaded_config():
     """
     This method returns the entire config file.
@@ -78,6 +74,7 @@ def _dec(cls):
     if container_cls is None:
         return _dec
     else:
+        container_cls.type_map = get_type_map()
         _dec(container_cls)
 
 

tests/unit/test_config.yaml

@@ -3,13 +3,13 @@ namespaces:
     version: TBD
     data_types:
       VectorData:
-        data: '/Users/mavaylon/Research/NWB/hdmf2/hdmf/tests/unit/example_test_term_set.yaml'
+        data: 'tests/unit/example_test_term_set.yaml'
         field2: '...'
       type2:
         field1: '...'
   hdmf-experimental:
     version: TBD
     data_types:
       type1:
-        field1: '/Users/mavaylon/Research/NWB/hdmf2/hdmf/tests/unit/example_test_term_set.yaml'
+        field1: 'tests/unit/example_test_term_set.yaml'
         field2: '...'

tests/unit/test_term_set.py

@@ -4,7 +4,8 @@
 from hdmf import Container
 from hdmf.term_set import TermSet, TermSetWrapper, TermSetConfigurator
 from hdmf.testing import TestCase, remove_test_file
-from hdmf.common import VectorIndex, VectorData, unload_termset_config, get_loaded_config, load_termset_config
+from hdmf.common import (VectorIndex, VectorData, unload_termset_config, get_loaded_config, load_termset_config,
+                        get_type_map)
 from hdmf.utils import popargs
 
 
@@ -227,7 +228,7 @@ def tearDown(self):
         unload_termset_config()
 
     def test_get_loaded_config(self):
-        load_termset_config(config_path='tests/unit/hdmf_config.yaml', return_map=True)
+        load_termset_config(config_path='tests/unit/hdmf_config.yaml')
         loaded_config = get_loaded_config()
         config = {'namespaces': {'hdmf-common': {'version': '3.12.2',
                   'data_types': {'VectorData': {'description': 'example_test_term_set.yaml'},
@@ -292,7 +293,7 @@ def setUp(self):
         if not REQUIREMENTS_INSTALLED:
             self.skipTest("optional LinkML module is not installed")
 
-        self.tm = load_termset_config(config_path='tests/unit/hdmf_config.yaml', return_map=True)
+        self.tm = get_type_map()
 
     def tearDown(self):
         unload_termset_config()