Rename base => bases

tests/samples.py

@@ -2,8 +2,7 @@
 
 from unittest.mock import Mock
 
-from yorm.base.converter import Converter
-from yorm.base.mappable import Mappable
+from yorm.bases import Converter, Mappable
 from yorm.utilities import sync, attr
 from yorm.converters import Dictionary, List
 from yorm.converters import String, Integer, Float, Boolean

tests/test_all_imports.py

@@ -1,5 +1,4 @@
-#!/usr/bin/env python
-# pylint:disable=W0404,W0612,C0111
+# pylint:disable=W0404,W0612,C
 
 """Integration tests the package namespace."""
 
@@ -10,7 +9,7 @@ def test_top():
 
     import yorm
 
-    assert yorm.base
+    assert yorm.bases
     assert yorm.converters.Integer
     assert yorm.converters.extended.Markdown
 
@@ -44,7 +43,3 @@ def test_from_nested():
     from yorm.converters.standard import String
     from yorm.converters.extended import Markdown
     from yorm.converters.containers import List
-
-
-if __name__ == '__main__':
-    pytest.main()

yorm/__init__.py

@@ -13,11 +13,10 @@
     exit("Python {}.{}+ is required.".format(*PYTHON_VERSION))
 
 try:
-    from . import base, converters
+    from . import bases, converters
     from .utilities import UUID
     from .utilities import sync, sync_object, sync_instances, attr
     from .utilities import update, update_object, update_file
-    from .base.mappable import Mappable
-    from .base.convertible import Converter, Convertible
+    from .bases import Container, Converter, Mappable, Convertible
 except ImportError:  # pragma: no cover (manual test)
     pass

yorm/converters/containers.py

@@ -1,7 +1,7 @@
 """Converter classes for builtin container types."""
 
 from .. import common
-from ..base import Convertible, Container
+from ..bases import Convertible, Container
 from . import standard
 
 log = common.logger(__name__)

yorm/converters/standard.py

@@ -1,8 +1,7 @@
 """Convertible classes for builtin immutable types."""
 
-from .. import common
-from .. import exceptions
-from ..base import Converter
+from .. import common, exceptions
+from ..bases import Converter
 
 log = common.logger(__name__)
 

yorm/mapper.py

@@ -6,10 +6,8 @@
 
 import yaml
 
-from . import common
-from . import exceptions
-from . import settings
-from .base import Container
+from . import common, exceptions, settings
+from .bases import Container
 
 MAPPER = 'yorm_mapper'
 

yorm/test/test_base_converter.py → yorm/test/test_bases_converter.py

@@ -5,7 +5,7 @@
 
 import pytest
 
-from yorm.base.converter import Converter
+from yorm.bases import Converter
 
 
 class TestConverter:

yorm/test/test_base_convertible.py → yorm/test/test_bases_convertible.py

@@ -5,7 +5,7 @@
 
 import pytest
 
-from yorm.base.convertible import Convertible
+from yorm.bases import Convertible
 
 
 class TestConvertible:

yorm/test/test_base_mappable.py → yorm/test/test_bases_mappable.py

@@ -8,8 +8,8 @@
 from unittest.mock import Mock
 
 import yorm
-from yorm.base.mappable import get_mapper, Mappable
-from yorm.mapper import Mapper
+from yorm.bases import Mappable
+from yorm.mapper import get_mapper, Mapper
 from yorm.converters import String, Integer, Boolean, List, Dictionary
 
 from . import strip

yorm/test/test_utilities.py

@@ -8,8 +8,7 @@
 
 from yorm import exceptions
 from yorm import utilities
-from yorm.base.converter import Converter
-from yorm.base.mappable import Mappable
+from yorm.bases import Converter, Mappable
 
 
 class MockConverter(Converter):

yorm/utilities.py

@@ -2,9 +2,8 @@
 
 import uuid
 
-from . import common
-from . import exceptions
-from .base import Mappable
+from . import common, exceptions
+from .bases import Mappable
 from .mapper import get_mapper, set_mapper
 
 log = common.logger(__name__)