Refractored code

databricks · Sep 18, 2024 · c42961b · c42961b
1 parent 8b167b9
commit c42961b
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 15 deletions.
diff --git a/databricks_sql_connector_core/pyproject.toml b/databricks_sql_connector_core/pyproject.toml
@@ -3,10 +3,7 @@ name = "databricks-sql-connector-core"
 version = "1.0.0"
 description = "Databricks SQL Connector core for Python"
 authors = ["Databricks <databricks-sql-connector-maintainers@databricks.com>"]
-license = "Apache-2.0"
-readme = "README.md"
 packages = [{ include = "databricks", from = "src" }]
-include = ["CHANGELOG.md"]
 
 [tool.poetry.dependencies]
 python = "^3.8.0"

diff --git a/databricks_sql_connector_core/src/databricks/sql/client.py b/databricks_sql_connector_core/src/databricks/sql/client.py
@@ -1,7 +1,6 @@
 from typing import Dict, Tuple, List, Optional, Any, Union, Sequence
 
 import pandas
-import pyarrow
 import requests
 import json
 import os

diff --git a/databricks_sql_connector_core/src/databricks/sql/thrift_backend.py b/databricks_sql_connector_core/src/databricks/sql/thrift_backend.py
@@ -8,7 +8,6 @@
 from ssl import CERT_NONE, CERT_REQUIRED, create_default_context
 from typing import List, Union
 
-import pyarrow
 import thrift.transport.THttpClient
 import thrift.protocol.TBinaryProtocol
 import thrift.transport.TSocket

diff --git a/databricks_sql_connector_core/src/databricks/sql/utils.py b/databricks_sql_connector_core/src/databricks/sql/utils.py
@@ -12,7 +12,6 @@
 from ssl import SSLContext
 
 import lz4.frame
-import pyarrow
 
 from databricks.sql import OperationalError, exc
 from databricks.sql.cloudfetch.download_manager import ResultFileDownloadManager

diff --git a/conftest.py → ...icks_sql_connector_core/tests/conftest.py b/conftest.py → ...icks_sql_connector_core/tests/conftest.py
diff --git a/databricks_sql_connector_core/tests/e2e/common/decimal_tests.py b/databricks_sql_connector_core/tests/e2e/common/decimal_tests.py
@@ -7,9 +7,13 @@
 except ImportError:
     pyarrow = None
 
-from tests.e2e.predicate import pysql_supports_arrow
+from tests.e2e.common.predicates import pysql_supports_arrow
 
 def decimal_and_expected_results():
+
+    if pyarrow is None:
+        return []
+
     return [
         ("100.001 AS DECIMAL(6, 3)", Decimal("100.001"), pyarrow.decimal128(6, 3)),
         ("1000000.0000 AS DECIMAL(11, 4)", Decimal("1000000.0000"), pyarrow.decimal128(11, 4)),
@@ -23,6 +27,10 @@ def decimal_and_expected_results():
     ]
 
 def multi_decimals_and_expected_results():
+
+    if pyarrow is None:
+        return []
+
     return [
         (
             ["1 AS DECIMAL(6, 3)", "100.001 AS DECIMAL(6, 3)", "NULL AS DECIMAL(6, 3)"],

diff --git a/databricks_sql_connector_core/tests/e2e/test_complex_types.py b/databricks_sql_connector_core/tests/e2e/test_complex_types.py
@@ -2,7 +2,7 @@
 from numpy import ndarray
 
 from tests.e2e.test_driver import PySQLPytestTestCase
-from tests.e2e.predicate import pysql_supports_arrow
+from tests.e2e.common.predicates import pysql_supports_arrow
 
 @pytest.mark.skipif(not pysql_supports_arrow(), reason="Skipping because pyarrow is not installed")
 class TestComplexTypes(PySQLPytestTestCase):

diff --git a/databricks_sql_connector_core/tests/e2e/test_parameterized_queries.py b/databricks_sql_connector_core/tests/e2e/test_parameterized_queries.py
@@ -28,7 +28,7 @@
     VoidParameter,
 )
 from tests.e2e.test_driver import PySQLPytestTestCase
-from tests.e2e.predicate import pysql_supports_arrow
+from tests.e2e.common.predicates import pysql_supports_arrow
 
 
 class ParamStyle(Enum):

diff --git a/databricks_sql_connector_core/tests/unit/test_arrow_queue.py b/databricks_sql_connector_core/tests/unit/test_arrow_queue.py
@@ -9,7 +9,7 @@
 except ImportError:
     pa = None
 
-from tests.e2e.predicate import pysql_supports_arrow
+from tests.e2e.common.predicates import pysql_supports_arrow
 
 @pytest.mark.skipif(not pysql_supports_arrow(), reason="Skipping because pyarrow is not installed")
 class ArrowQueueSuite(unittest.TestCase):

diff --git a/databricks_sql_connector_core/tests/unit/test_cloud_fetch_queue.py b/databricks_sql_connector_core/tests/unit/test_cloud_fetch_queue.py
@@ -5,7 +5,7 @@
 
 from databricks.sql.thrift_api.TCLIService.ttypes import TSparkArrowResultLink
 import databricks.sql.utils as utils
-from tests.e2e.predicate import pysql_supports_arrow
+from tests.e2e.common.predicates import pysql_supports_arrow
 
 try:
     import pyarrow

diff --git a/databricks_sql_connector_core/tests/unit/test_download_manager.py b/databricks_sql_connector_core/tests/unit/test_download_manager.py
@@ -7,7 +7,7 @@
 import databricks.sql.cloudfetch.download_manager as download_manager
 from databricks.sql.thrift_api.TCLIService.ttypes import TSparkArrowResultLink
 
-from tests.e2e.predicate import pysql_supports_arrow
+from tests.e2e.common.predicates import pysql_supports_arrow
 
 @pytest.mark.skipif(not pysql_supports_arrow(), reason="Skipping because pyarrow is not installed")
 class DownloadManagerTests(unittest.TestCase):

diff --git a/databricks_sql_connector_core/tests/unit/test_fetches.py b/databricks_sql_connector_core/tests/unit/test_fetches.py
@@ -4,7 +4,7 @@
 
 import databricks.sql.client as client
 from databricks.sql.utils import ExecuteResponse, ArrowQueue
-from tests.e2e.predicate import pysql_supports_arrow
+from tests.e2e.common.predicates import pysql_supports_arrow
 
 try:
     import pyarrow as pa

diff --git a/databricks_sql_connector_core/tests/unit/test_fetches_bench.py b/databricks_sql_connector_core/tests/unit/test_fetches_bench.py
@@ -7,7 +7,7 @@
 
 import databricks.sql.client as client
 from databricks.sql.utils import ExecuteResponse, ArrowQueue
-from tests.e2e.predicate import pysql_supports_arrow
+from tests.e2e.common.predicates import pysql_supports_arrow
 
 try:
     import pyarrow as pa

diff --git a/databricks_sql_connector_core/tests/unit/test_thrift_backend.py b/databricks_sql_connector_core/tests/unit/test_thrift_backend.py
@@ -12,7 +12,7 @@
 from databricks.sql import *
 from databricks.sql.auth.authenticators import AuthProvider
 from databricks.sql.thrift_backend import ThriftBackend
-from tests.e2e.predicate import pysql_supports_arrow
+from tests.e2e.common.predicates import pysql_supports_arrow
 
 try:
     import pyarrow