Fix circular imports

Author: tupui

rbc/heavydb.py

@@ -13,7 +13,6 @@
 from .thrift.utils import resolve_includes
 from .thrift import Client as ThriftClient
 from . import heavyai
-from .omniscidb import RemoteOmnisci
 from .heavyai import (
     OmnisciArrayType, OmnisciBytesType, OmnisciTextEncodingDictType,
     OmnisciOutputColumnType, OmnisciColumnType,
@@ -1473,3 +1472,8 @@ def remote_call(self, func, ftype: typesystem.Type, arguments: tuple, hold=False
             return numpy.array(list(result), dtype).view(numpy.recarray)
         else:
             return dtype[0][1](list(result)[0][0])
+
+
+class RemoteOmnisci(RemoteHeavyDB):
+    """Omnisci - the previous brand of HeavyAI
+    """

rbc/omniscidb.py

@@ -1,10 +1,6 @@
-import warnings
+import warnings  # noqa: F401
+from .heavydb import *  # noqa: F401, F403
 
-from rbc.heavydb import RemoteHeavyDB
 
-
-class RemoteOmnisci(RemoteHeavyDB):
-    """Omnisci - the previous brand of HeavyAI
-    """
-    msg = "`RemoteOmnisci` is deprecated, use `RemoteHeavyDB` instead."
-    warnings.warn(msg, PendingDeprecationWarning)
+msg = "`RemoteOmnisci` is deprecated, use `RemoteHeavyDB` instead."
+warnings.warn(msg, PendingDeprecationWarning)

rbc/tests/heavyai/test_array.py

@@ -1,7 +1,6 @@
 import os
 from collections import defaultdict
 
-import rbc.omniscidb
 from rbc.heavyai import Array
 from rbc.errors import OmnisciServerError
 from rbc.stdlib import array_api
@@ -17,7 +16,7 @@
 def heavydb():
     # TODO: use heavydb_fixture from rbc/tests/__init__.py
     config = rbc_heavydb.get_client_config(debug=not True)
-    m = rbc.omniscidb.RemoteOmnisci(**config)
+    m = rbc_heavydb.RemoteHeavyDB(**config)
     table_name = os.path.splitext(os.path.basename(__file__))[0]
 
     m.sql_execute(f'DROP TABLE IF EXISTS {table_name}')

rbc/tests/heavyai/test_array_functions.py

@@ -1,7 +1,6 @@
 import pytest
 import numpy as np
 
-import rbc.omniscidb
 from rbc.stdlib import array_api
 from numba.core import types
 
@@ -15,7 +14,7 @@
 def heavydb():
     # TODO: use heavydb_fixture from rbc/tests/__init__.py
     config = rbc_heavydb.get_client_config(debug=not True)
-    m = rbc.omniscidb.RemoteOmnisci(**config)
+    m = rbc_heavydb.RemoteHeavyDB(**config)
     table_name = 'rbc_test_heavydb_array'
 
     m.sql_execute(f'DROP TABLE IF EXISTS {table_name}')

rbc/tests/heavyai/test_array_math.py

@@ -1,7 +1,6 @@
 import pytest
 import numpy as np
 import rbc.heavyai as omni  # noqa: F401
-import rbc.omniscidb
 from rbc.stdlib import array_api
 
 
@@ -14,7 +13,7 @@
 def heavydb():
     # TODO: use heavydb_fixture from rbc/tests/__init__.py
     config = rbc_heavydb.get_client_config(debug=not True)
-    m = rbc.omniscidb.RemoteOmnisci(**config)
+    m = rbc_heavydb.RemoteHeavyDB(**config)
     table_name = 'rbc_test_heavydb_array'
 
     m.sql_execute(f'DROP TABLE IF EXISTS {table_name}')

rbc/tests/heavyai/test_math.py

@@ -3,8 +3,9 @@
 import sys
 import numpy as np
 import numba as nb
+
+import rbc.heavydb
 import rbc.heavydb as rbc_heavydb
-import rbc.omniscidb
 from rbc.stdlib import array_api
 
 available_version, reason = rbc_heavydb.is_available()
@@ -21,7 +22,7 @@ def nb_version():
 def heavydb():
     # TODO: use heavydb_fixture from rbc/tests/__init__.py
     config = rbc_heavydb.get_client_config(debug=not True)
-    m = rbc.omniscidb.RemoteOmnisci(**config)
+    m = rbc_heavydb.RemoteHeavyDB(**config)
     table_name = 'rbc_test_heavydb_math'
 
     m.sql_execute(f'DROP TABLE IF EXISTS {table_name}')