Further improved imports

equinor · Nov 28, 2021 · 79c56bb · 79c56bb
1 parent 64cc241
commit 79c56bb
Show file tree

Hide file tree

Showing 6 changed files with 198 additions and 190 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "python.formatting.provider": "black"
+}
diff --git a/pyscal/__init__.py b/pyscal/__init__.py
@@ -86,6 +86,7 @@ def getLogger_pyscal(
 from .scalrecommendation import SCALrecommendation  # noqa
 from .pyscallist import PyscalList  # noqa
 from .factory import (
+    slicedict,
     create_water_oil,
     create_gas_oil,
     create_water_oil_gas,
@@ -100,4 +101,9 @@ def getLogger_pyscal(
     create_wateroil_list,
     create_gasoil_list,
     create_gaswater_list,
+    sufficient_water_oil_params,
+    sufficient_gas_oil_params,
+    sufficient_gas_water_params,
+    filter_nan_from_dict,
+    infer_tabular_file_format,
 )  # noqa
diff --git a/pyscal/pyscalcli.py b/pyscal/pyscalcli.py
@@ -14,9 +14,6 @@
     WaterOilGas,
     __version__,
     getLogger_pyscal,
-)
-
-from .factory import (
     load_relperm_df,
     create_scal_recommendation_list,
     create_pyscal_list,