from .context import CartoContext
from .credentials import Credentials
from .layer import BaseMap, QueryLayer, Layer
from .styling import BinMethod
from .__version__ import __version__


__all__ = [

    # Current API
    'CartoContext',
    'Credentials',
    'BaseMap',
    'QueryLayer',
    'Layer',
    'BinMethod',

    # New API
    'Context',

    '__version__'
]

from .context import CartoContext
from .credentials import Credentials
from .layer import BaseMap, QueryLayer, Layer
from .styling import BinMethod
from .__version__ import __version__


__all__ = [

    # Current API
    'CartoContext',
    'Credentials',
    'BaseMap',
    'QueryLayer',
    'Layer',
    'BinMethod',

    # New API


    '__version__'
]

fix merge error in main init