From e8187d23c839c739d967ccef966158b2c6678f1b Mon Sep 17 00:00:00 2001 From: Leon Luttenberger Date: Tue, 23 Apr 2024 14:58:25 -0500 Subject: [PATCH] move adbc to optional argument --- poetry.lock | 5 +++-- pyproject.toml | 4 +++- tox.ini | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/poetry.lock b/poetry.lock index e163df853..c519b94a7 100644 --- a/poetry.lock +++ b/poetry.lock @@ -6364,6 +6364,7 @@ docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.link testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy (>=0.9.1)", "pytest-ruff"] [extras] +adbc = ["adbc-driver-postgresql"] deltalake = ["deltalake"] geopandas = ["geopandas", "geopandas"] gremlin = ["aiohttp", "async-timeout", "gremlinpython", "requests"] @@ -6373,7 +6374,7 @@ opencypher = ["requests"] openpyxl = ["openpyxl"] opensearch = ["jsonpath-ng", "opensearch-py", "requests-aws4auth"] oracle = ["oracledb"] -postgres = ["adbc-driver-postgresql", "pg8000"] +postgres = ["pg8000"] progressbar = ["progressbar2"] ray = ["ray"] redshift = ["redshift-connector"] @@ -6383,4 +6384,4 @@ sqlserver = ["pyodbc"] [metadata] lock-version = "2.0" python-versions = ">=3.8, <4.0" -content-hash = "c398a4cda3edbe16a2cbb3399ef9ad1c7f2235eba0c1e2893a4ec2807b2ef4e6" +content-hash = "4705e3cadb19979ee0c3ae4afd60c314fd6307550a86ee535d06e789df2663e7" diff --git a/pyproject.toml b/pyproject.toml index 1976a8314..9272e26a3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -53,6 +53,7 @@ pg8000 = { version = "^1.29.0", optional = true } pyodbc = { version = ">=4,<6", optional = true } oracledb = { version = ">=1,<3", optional = true } +# ArrowDBC adbc-driver-postgresql = { version = "^0.11.0", optional = true } # Graph @@ -86,9 +87,10 @@ ray = { version = "^2.10.0", extras = ["default", "data"], optional = true } [tool.poetry.extras] redshift = ["redshift-connector"] mysql = ["pymysql"] -postgres = ["pg8000", "adbc-driver-postgresql"] +postgres = ["pg8000"] sqlserver = ["pyodbc"] oracle = ["oracledb"] +adbc = ["adbc-driver-postgresql"] gremlin = ["gremlinpython", "requests", "aiohttp", "async-timeout"] sparql = ["SPARQLWrapper", "requests"] opencypher = ["requests"] diff --git a/tox.ini b/tox.ini index 6507ec916..b5b2ab3d1 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ setenv = COV_FAIL_UNDER = 87.00 allowlist_externals = poetry commands_pre = - poetry install --no-root --sync --extras "deltalake gremlin mysql opencypher opensearch oracle postgres redshift sparql sqlserver geopandas" + poetry install --no-root --sync --extras "deltalake gremlin mysql opencypher opensearch oracle postgres adbc redshift sparql sqlserver geopandas" commands = pytest -n {posargs} -s -v --timeout=300 --reruns=2 --reruns-delay=15 \ --cov=awswrangler --cov-report=xml --cov-report term-missing --cov-branch \