get rid of importlib use

Author: JohnMount

build/lib/data_algebra/__init__.py

@@ -17,9 +17,9 @@
 Recommended packages include: Pandas, PyYAML (supplies yaml), sqlparse, and black. 
 """
 
-import importlib
 import data_algebra.pandas_model
+import pandas
 
 default_data_model = data_algebra.pandas_model.PandasModel(
-    pd=importlib.import_module("pandas"),
+    pd=pandas,
     presentation_model_name='pandas')

build/lib/data_algebra/modin_model.py

@@ -1,6 +1,5 @@
 
 
-import importlib
 import os
 
 import data_algebra.eval_model
@@ -23,7 +22,8 @@ def __init__(self, modin_engine=None):
             MODIN_ENGINE = modin_engine
             # https://github.com/modin-project/modin
             os.environ["MODIN_ENGINE"] = MODIN_ENGINE
-            MODIN_PANDAS = importlib.import_module("modin.pandas")
+            import modin.pandas
+            MODIN_PANDAS = modin.pandas
         else:
             if (modin_engine is not None) and (modin_engine != MODIN_ENGINE):
                 raise ValueError("MODIN_ENGINE already set to "

build/lib/data_algebra/pandas_base.py

@@ -13,11 +13,6 @@
 
 
 # TODO: possibly import dask, Nvidia Rapids, or modin instead
-# can't do that now
-# https://github.com/modin-project/modin/issues/865
-# requires: modin, ray, distributed
-# pip install modin[ray]
-# pd = importlib.import_module("modin.pandas")  # https://github.com/modin-project/modin
 
 # base class for Pandas-like API realization
 class PandasModelBase(data_algebra.data_model.DataModel, ABC):

coverage.txt

@@ -94,4 +94,4 @@ data_algebra/yaml.py                      95     11    88%
 TOTAL                                   4115    812    80%
 
 
-============================= 101 passed in 16.88s =============================
+============================= 101 passed in 16.91s =============================

data_algebra/__init__.py

@@ -17,9 +17,9 @@
 Recommended packages include: Pandas, PyYAML (supplies yaml), sqlparse, and black. 
 """
 
-import importlib
 import data_algebra.pandas_model
+import pandas
 
 default_data_model = data_algebra.pandas_model.PandasModel(
-    pd=importlib.import_module("pandas"),
+    pd=pandas,
     presentation_model_name='pandas')

data_algebra/modin_model.py

@@ -1,6 +1,5 @@
 
 
-import importlib
 import os
 
 import data_algebra.eval_model
@@ -23,7 +22,8 @@ def __init__(self, modin_engine=None):
             MODIN_ENGINE = modin_engine
             # https://github.com/modin-project/modin
             os.environ["MODIN_ENGINE"] = MODIN_ENGINE
-            MODIN_PANDAS = importlib.import_module("modin.pandas")
+            import modin.pandas
+            MODIN_PANDAS = modin.pandas
         else:
             if (modin_engine is not None) and (modin_engine != MODIN_ENGINE):
                 raise ValueError("MODIN_ENGINE already set to "

data_algebra/pandas_base.py

@@ -13,11 +13,6 @@
 
 
 # TODO: possibly import dask, Nvidia Rapids, or modin instead
-# can't do that now
-# https://github.com/modin-project/modin/issues/865
-# requires: modin, ray, distributed
-# pip install modin[ray]
-# pd = importlib.import_module("modin.pandas")  # https://github.com/modin-project/modin
 
 # base class for Pandas-like API realization
 class PandasModelBase(data_algebra.data_model.DataModel, ABC):

dist/data_algebra-0.5.3-py3-none-any.whl

@@ -1,11 +1,10 @@
 
-import importlib
 import pytest
 import warnings
 
 import data_algebra
 from data_algebra.data_ops import *
-from data_algebra.modin_model import ModinModel
+import data_algebra.modin_model
 import data_algebra.test_util
 
 modin_engine_choice = 'ray'
@@ -15,8 +14,8 @@ def test_modin():
     modin_pandas = None
     data_model = None
     try:
-        modin_pandas = importlib.import_module("modin.pandas")
-        data_model = ModinModel(modin_engine=modin_engine_choice)
+        data_model = data_algebra.modin_model.ModinModel(modin_engine=modin_engine_choice)
+        modin_pandas = data_algebra.modin_model.MODIN_PANDAS
     except:
         pass
 
@@ -57,8 +56,8 @@ def test_modin_gcalc():
     modin_pandas = None
     data_model = None
     try:
-        modin_pandas = importlib.import_module("modin.pandas")
-        data_model = ModinModel(modin_engine=modin_engine_choice)
+        data_model = data_algebra.modin_model.ModinModel(modin_engine=modin_engine_choice)
+        modin_pandas = data_algebra.modin_model.MODIN_PANDAS
     except:
         pass