Skip to content

Commit

Permalink
refactor: Use absolute imports instead of relative
Browse files Browse the repository at this point in the history
  • Loading branch information
Sieboldianus committed Feb 23, 2021
1 parent 42fe31f commit ab8db19
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 44 deletions.
18 changes: 9 additions & 9 deletions lbsntransform/__init__.py
Expand Up @@ -2,16 +2,16 @@

"""LBSNtransform package import specifications"""

from .version import __version__
from lbsntransform.version import __version__

from .lbsntransform_ import LBSNTransform
from .config.config import BaseConfig
from .input.load_data import LoadData
from .output.hll.shared_structure_proto_hlldb import ProtoHLLMapping
from .output.lbsn.shared_structure_proto_lbsndb import ProtoLBSNMapping
from .output.shared_structure import (GeocodeLocations, LBSNRecordDicts,
TimeMonitor)
from .tools.helper_functions import HelperFunctions as HF
from lbsntransform.lbsntransform_ import LBSNTransform
from lbsntransform.config.config import BaseConfig
from lbsntransform.input.load_data import LoadData
from lbsntransform.output.hll.shared_structure_proto_hlldb import ProtoHLLMapping
from lbsntransform.output.lbsn.shared_structure_proto_lbsndb import ProtoLBSNMapping
from lbsntransform.output.shared_structure import (
GeocodeLocations, LBSNRecordDicts, TimeMonitor)
from lbsntransform.tools.helper_functions import HelperFunctions as HF

# pdoc documentation exclude/include format
__pdoc__ = {}
Expand Down
9 changes: 5 additions & 4 deletions lbsntransform/input/load_data.py
Expand Up @@ -19,10 +19,11 @@
import requests
from lbsnstructure import lbsnstructure_pb2 as lbsn

from ..tools.db_connection import DBConnection
from ..output.shared_structure import GeocodeLocations
from ..tools.helper_functions import HelperFunctions as HF
from .mappings.db_query import InputSQL, LBSN_SCHEMA, optional_schema_override
from lbsntransform.tools.db_connection import DBConnection
from lbsntransform.output.shared_structure import GeocodeLocations
from lbsntransform.tools.helper_functions import HelperFunctions as HF
from lbsntransform.input.mappings.db_query import (
InputSQL, LBSN_SCHEMA, optional_schema_override)

# type alias
LBSNObjects = Union[
Expand Down
8 changes: 4 additions & 4 deletions lbsntransform/lbsntransform_.py
Expand Up @@ -16,10 +16,10 @@
import sys
from pathlib import Path

from .tools.helper_functions import HelperFunctions as HF
from .output.shared_structure import LBSNRecordDicts
from .output.submit_data import LBSNTransfer
from .input.load_data import LoadData
from lbsntransform.tools.helper_functions import HelperFunctions as HF
from lbsntransform.output.shared_structure import LBSNRecordDicts
from lbsntransform.output.submit_data import LBSNTransfer
from lbsntransform.input.load_data import LoadData


class LBSNTransform():
Expand Down
2 changes: 1 addition & 1 deletion lbsntransform/output/hll/base/social.py
Expand Up @@ -8,7 +8,7 @@
from lbsnstructure import lbsnstructure_pb2 as lbsn
from lbsntransform.output.hll import hll_bases as hll

from ..hll_functions import HLLFunctions as HLF
from lbsntransform.output.hll.hll_functions import HLLFunctions as HLF

FACET = 'social'

Expand Down
2 changes: 1 addition & 1 deletion lbsntransform/output/hll/base/spatial.py
Expand Up @@ -9,7 +9,7 @@
from lbsntransform.output.hll import hll_bases as hll
from lbsntransform.tools.helper_functions import HelperFunctions as HF

from ..hll_functions import HLLFunctions as HLF
from lbsntransform.output.hll.hll_functions import HLLFunctions as HLF

FACET = 'spatial'

Expand Down
2 changes: 1 addition & 1 deletion lbsntransform/output/hll/base/temporal.py
Expand Up @@ -6,7 +6,7 @@
from lbsnstructure import lbsnstructure_pb2 as lbsn
from lbsntransform.output.hll import hll_bases as hll

from ..hll_functions import HLLFunctions as HLF
from lbsntransform.output.hll.hll_functions import HLLFunctions as HLF

FACET = 'temporal'

Expand Down
2 changes: 1 addition & 1 deletion lbsntransform/output/hll/shared_structure_proto_hlldb.py
Expand Up @@ -12,7 +12,7 @@
from lbsntransform.output.hll import hll_bases as hll
from lbsntransform.output.hll.base import social, spatial, temporal, topical

from .hll_functions import HLLFunctions as HLF
from lbsntransform.output.hll.hll_functions import HLLFunctions as HLF

HllBases = Union[
spatial.LatLngBase, spatial.PlaceBase,
Expand Down
2 changes: 1 addition & 1 deletion lbsntransform/output/lbsn/sql_lbsn.py
Expand Up @@ -7,7 +7,7 @@
from lbsnstructure import lbsnstructure_pb2 as lbsn
from lbsntransform.tools.helper_functions import HelperFunctions as HF

from .shared_structure_proto_lbsndb import ProtoLBSNMapping
from lbsntransform.output.lbsn.shared_structure_proto_lbsndb import ProtoLBSNMapping


class LBSNSql():
Expand Down
16 changes: 8 additions & 8 deletions lbsntransform/output/submit_data.py
Expand Up @@ -16,14 +16,14 @@
from lbsnstructure import lbsnstructure_pb2 as lbsn
from lbsntransform.tools.helper_functions import HelperFunctions as HF

from .csv.store_csv import LBSNcsv
from .hll import hll_bases as hll
from .hll.base import social, spatial, temporal, topical
from .hll.hll_functions import HLLFunctions as HLF
from .hll.shared_structure_proto_hlldb import ProtoHLLMapping
from .hll.sql_hll import HLLSql
from .lbsn.shared_structure_proto_lbsndb import ProtoLBSNMapping
from .lbsn.sql_lbsn import LBSNSql
from lbsntransform.output.csv.store_csv import LBSNcsv
from lbsntransform.output.hll import hll_bases as hll
from lbsntransform.output.hll.base import social, spatial, temporal, topical
from lbsntransform.output.hll.hll_functions import HLLFunctions as HLF
from lbsntransform.output.hll.shared_structure_proto_hlldb import ProtoHLLMapping
from lbsntransform.output.hll.sql_hll import HLLSql
from lbsntransform.output.lbsn.shared_structure_proto_lbsndb import ProtoLBSNMapping
from lbsntransform.output.lbsn.sql_lbsn import LBSNSql


class LBSNTransfer():
Expand Down
28 changes: 14 additions & 14 deletions lbsntransform/tools/helper_functions.py
Expand Up @@ -6,38 +6,38 @@


import datetime as dt
import json
import importlib.util
import json
import logging
# due to different protocol buffers implementations on Unix, MacOS and Windows
# import types based on OS
import platform
import re
import inspect
import sys
import regex
import string
from pathlib import Path
from datetime import timezone
from json import JSONDecodeError, JSONDecoder
from typing import List, Set, Union, Optional
from pathlib import Path
from typing import List, Optional, Set, Union

import emoji
import regex
from google.protobuf.timestamp_pb2 import Timestamp
from lbsnstructure import lbsnstructure_pb2 as lbsn
from lbsntransform.output.shared_structure import Coordinates
from shapely import geos, wkt
from shapely.geometry import Point, Polygon

from lbsnstructure import lbsnstructure_pb2 as lbsn

from ..output.shared_structure import Coordinates

PLATFORM_SYS = platform.system()
if PLATFORM_SYS == 'Linux':
from google.protobuf.pyext._message import RepeatedCompositeContainer # pylint: disable=no-name-in-module
from google.protobuf.pyext._message import ScalarMapContainer # pylint: disable=no-name-in-module
from google.protobuf.pyext._message import \
RepeatedCompositeContainer # pylint: disable=no-name-in-module
from google.protobuf.pyext._message import \
ScalarMapContainer # pylint: disable=no-name-in-module
else:
from google.protobuf.internal.containers import RepeatedCompositeFieldContainer # pylint: disable=no-name-in-module
from google.protobuf.internal.containers import ScalarMapContainer # pylint: disable=no-name-in-module
from google.protobuf.internal.containers import \
RepeatedCompositeFieldContainer # pylint: disable=no-name-in-module
from google.protobuf.internal.containers import \
ScalarMapContainer # pylint: disable=no-name-in-module

NLTK_AVAIL = True
try:
Expand Down

0 comments on commit ab8db19

Please sign in to comment.