From a05b1fed7825a88831f1ecb2a5870c264dab7fff Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sat, 23 Dec 2023 10:59:48 -0500 Subject: [PATCH] chore: remove duckdb_engine from deps --- .github/renovate.json | 2 +- ibis/backends/tests/test_benchmarks.py | 3 --- poetry.lock | 21 +++------------------ pyproject.toml | 7 +------ requirements-dev.txt | 1 - 5 files changed, 5 insertions(+), 29 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 3a3dbe6073de..a2e3a325fad7 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -46,7 +46,7 @@ "addLabels": ["bigquery"] }, { - "matchPackagePatterns": ["duckdb", "duckdb-engine"], + "matchPackagePatterns": ["duckdb"], "addLabels": ["duckdb"] }, { diff --git a/ibis/backends/tests/test_benchmarks.py b/ibis/backends/tests/test_benchmarks.py index 9c23b1fc09b6..0305b4fcd6b1 100644 --- a/ibis/backends/tests/test_benchmarks.py +++ b/ibis/backends/tests/test_benchmarks.py @@ -717,7 +717,6 @@ def test_repr_join(benchmark, customers, orders, orders_items, products): @pytest.mark.parametrize("overwrite", [True, False], ids=["overwrite", "no_overwrite"]) def test_insert_duckdb(benchmark, overwrite, tmp_path): pytest.importorskip("duckdb") - pytest.importorskip("duckdb_engine") n_rows = int(1e4) table_name = "t" @@ -806,7 +805,6 @@ def test_duckdb_to_pyarrow(benchmark, sql, ddb) -> None: def test_ibis_duckdb_to_pyarrow(benchmark, sql, ddb) -> None: pytest.importorskip("duckdb") - pytest.importorskip("duckdb_engine") con = ibis.duckdb.connect(ddb, read_only=True) @@ -876,7 +874,6 @@ def test_big_join_expr(benchmark, src, diff): def test_big_join_execute(benchmark, nrels): pytest.importorskip("duckdb") - pytest.importorskip("duckdb_engine") con = ibis.duckdb.connect() diff --git a/poetry.lock b/poetry.lock index f7ebe7e10f0a..8fe41d941b66 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1428,21 +1428,6 @@ files = [ {file = "duckdb-0.9.2.tar.gz", hash = "sha256:3843afeab7c3fc4a4c0b53686a4cc1d9cdbdadcbb468d60fef910355ecafd447"}, ] -[[package]] -name = "duckdb-engine" -version = "0.9.4" -description = "SQLAlchemy driver for duckdb" -optional = true -python-versions = ">=3.7" -files = [ - {file = "duckdb_engine-0.9.4-py3-none-any.whl", hash = "sha256:3bb06c40b2f82ea8d9c596279553105457dc63a2b6173c6e6e75a6cba2b93f95"}, - {file = "duckdb_engine-0.9.4.tar.gz", hash = "sha256:019696f4585af7e903c350c196df778334ff1739a164bb9f752630fb0886a8b0"}, -] - -[package.dependencies] -duckdb = ">=0.4.0" -sqlalchemy = ">=1.3.22" - [[package]] name = "dulwich" version = "0.21.7" @@ -7333,7 +7318,7 @@ cffi = {version = ">=1.11", markers = "platform_python_implementation == \"PyPy\ cffi = ["cffi (>=1.11)"] [extras] -all = ["black", "clickhouse-connect", "dask", "datafusion", "db-dtypes", "deltalake", "duckdb", "duckdb-engine", "geoalchemy2", "geopandas", "google-cloud-bigquery", "google-cloud-bigquery-storage", "graphviz", "impyla", "oracledb", "packaging", "polars", "psycopg2", "pydata-google-auth", "pydruid", "pymysql", "pyodbc", "pyspark", "regex", "shapely", "snowflake-connector-python", "snowflake-sqlalchemy", "sqlalchemy", "sqlalchemy-exasol", "sqlalchemy-views", "trino"] +all = ["black", "clickhouse-connect", "dask", "datafusion", "db-dtypes", "deltalake", "duckdb", "geoalchemy2", "geopandas", "google-cloud-bigquery", "google-cloud-bigquery-storage", "graphviz", "impyla", "oracledb", "packaging", "polars", "psycopg2", "pydata-google-auth", "pydruid", "pymysql", "pyodbc", "pyspark", "regex", "shapely", "snowflake-connector-python", "snowflake-sqlalchemy", "sqlalchemy", "sqlalchemy-exasol", "sqlalchemy-views", "trino"] bigquery = ["db-dtypes", "google-cloud-bigquery", "google-cloud-bigquery-storage", "pydata-google-auth"] clickhouse = ["clickhouse-connect"] dask = ["dask", "regex"] @@ -7341,7 +7326,7 @@ datafusion = ["datafusion"] decompiler = ["black"] deltalake = ["deltalake"] druid = ["pydruid", "sqlalchemy"] -duckdb = ["duckdb", "duckdb-engine", "sqlalchemy", "sqlalchemy-views"] +duckdb = ["duckdb"] exasol = ["sqlalchemy", "sqlalchemy-exasol", "sqlalchemy-views"] flink = [] geospatial = ["geoalchemy2", "geopandas", "shapely"] @@ -7361,4 +7346,4 @@ visualization = ["graphviz"] [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "aa13be46cebb9a2a8c865fae6a65b1a30836c912d9efb6b9e3b07b91f7b6fec1" +content-hash = "4004ec5e38fc42290cb6ba70e93cafa4a77c74538aa74492cb3ac74de1adef0c" diff --git a/pyproject.toml b/pyproject.toml index 8beb3c5abd62..79631924b6a5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -67,7 +67,6 @@ datafusion = { version = ">=0.6,<34", optional = true } db-dtypes = { version = ">=0.3,<2", optional = true } deltalake = { version = ">=0.9.0,<1", optional = true } duckdb = { version = ">=0.8.1,<1", optional = true } -duckdb-engine = { version = ">=0.1.8,<1", optional = true } geoalchemy2 = { version = ">=0.6.3,<1", optional = true } geopandas = { version = ">=0.6,<1", optional = true } google-cloud-bigquery = { version = ">=3,<4", optional = true } @@ -155,7 +154,6 @@ all = [ "datafusion", "db-dtypes", "duckdb", - "duckdb-engine", "deltalake", "geoalchemy2", "geopandas", @@ -191,7 +189,7 @@ clickhouse = ["clickhouse-connect"] dask = ["dask", "regex"] datafusion = ["datafusion"] druid = ["pydruid", "sqlalchemy"] -duckdb = ["duckdb", "duckdb-engine", "sqlalchemy", "sqlalchemy-views"] +duckdb = ["duckdb"] exasol = ["sqlalchemy", "sqlalchemy-exasol", "sqlalchemy-views"] flink = [] geospatial = ["geoalchemy2", "geopandas", "shapely"] @@ -295,9 +293,6 @@ filterwarnings = [ 'ignore:`np\.bool` is a deprecated alias for the builtin `bool`:DeprecationWarning', # numpy, coming from a pandas call 'ignore:In the future `np\.bool` will be defined as the corresponding NumPy scalar:FutureWarning', - # duckdb-engine - 'ignore:Dialect .+ does \*not\* support Decimal:', - "ignore:duckdb-engine doesn't yet support reflection on indices:", # druid 'ignore:Dialect druid.rest will not make use of SQL compilation caching:', # ibis diff --git a/requirements-dev.txt b/requirements-dev.txt index 9bf7f56b6649..9d5db17f84a1 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -49,7 +49,6 @@ decorator==5.1.1 ; python_version >= "3.9" and python_version < "4.0" deltalake==0.14.0 ; python_version >= "3.9" and python_version < "4.0" distlib==0.3.8 ; python_version >= "3.9" and python_version < "4.0" distributed==2023.12.1 ; python_version >= "3.10" and python_version < "3.13" -duckdb-engine==0.9.4 ; python_version >= "3.9" and python_version < "4.0" duckdb==0.9.2 ; python_version >= "3.9" and python_version < "4.0" dulwich==0.21.7 ; python_version >= "3.9" and python_version < "4.0" dunamai==1.19.0 ; python_version >= "3.9" and python_version < "4.0"