diff options
6 files changed, 21 insertions, 43 deletions
diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index 03857e962a832..343574f251a8b 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -98,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: { # fails with Out of Memory Error "test/sql/copy/parquet/batched_write/batch_memory_usage.test" # wants http connection + "test/sql/copy/csv/recursive_query_csv.test" "test/sql/copy/csv/test_mixed_lines.test" ] ++ lib.optionals stdenv.isAarch64 [ "test/sql/aggregate/aggregates/test_kurtosis.test" diff --git a/pkgs/development/libraries/duckdb/versions.json b/pkgs/development/libraries/duckdb/versions.json index efb151413e3d9..de679be88599a 100644 --- a/pkgs/development/libraries/duckdb/versions.json +++ b/pkgs/development/libraries/duckdb/versions.json @@ -1,5 +1,5 @@ { - "version": "0.10.1", - "rev": "4a89d97db8a5a23a15f3025c8d2d2885337c2637", - "hash": "sha256-/j/DaUzsfACI5Izr4lblkYmIEmKsOXr760UTwC0l/qg=" + "version": "0.10.2", + "rev": "1601d94f94a7e0d2eb805a94803eb1e3afbbe4ed", + "hash": "sha256-CTZ90KJvLPQqu1FYciEWsxJbvybCjeBsi/12bkfVd9Q=" } diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix index 955334bdf283d..be851c7e16fa9 100644 --- a/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/pkgs/development/python-modules/duckdb-engine/default.nix @@ -6,7 +6,9 @@ , duckdb , hypothesis , ipython-sql +, pandas , poetry-core +, pytest-remotedata , snapshottest , sqlalchemy , typing-extensions @@ -14,20 +16,18 @@ buildPythonPackage rec { pname = "duckdb-engine"; - version = "0.11.2"; + version = "0.12.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { repo = "duckdb_engine"; owner = "Mause"; rev = "refs/tags/v${version}"; - hash = "sha256-yW1gaZ0B6JNX98KzAxf146goniNmWnkMUmJRrScot1w="; + hash = "sha256-cm0vbz0VZ2Ws6FDWJO16q4KZW2obs0CBNrfY9jmR+6A="; }; - patches = [ ./remote_data.patch ]; - nativeBuildInputs = [ poetry-core ]; @@ -42,24 +42,27 @@ buildPythonPackage rec { ''; disabledTests = [ - # this test tries to download the httpfs extension - "test_preload_extension" - "test_motherduck" # test should be skipped based on sqlalchemy version but isn't and fails "test_commit" - # rowcount no longer generates an attribute error. - "test_rowcount" ]; nativeCheckInputs = [ pytestCheckHook + ]; + + checkInputs = [ hypothesis ipython-sql - # TODO(cpcloud): include pandas here when it supports sqlalchemy 2.0 + pandas + pytest-remotedata snapshottest typing-extensions ]; + pytestFlagsArray = [ + "-m" "'not remote_data'" + ]; + pythonImportsCheck = [ "duckdb_engine" ]; diff --git a/pkgs/development/python-modules/duckdb-engine/remote_data.patch b/pkgs/development/python-modules/duckdb-engine/remote_data.patch deleted file mode 100644 index 1c887acf6caea..0000000000000 --- a/pkgs/development/python-modules/duckdb-engine/remote_data.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/duckdb_engine/tests/test_basic.py b/duckdb_engine/tests/test_basic.py -index 302636f..ed20f12 100644 ---- a/duckdb_engine/tests/test_basic.py -+++ b/duckdb_engine/tests/test_basic.py -@@ -183,7 +183,6 @@ def test_get_views(engine: Engine) -> None: - - - @mark.skipif(os.uname().machine == "aarch64", reason="not supported on aarch64") --@mark.remote_data - def test_preload_extension() -> None: - duckdb.default_connection.execute("INSTALL httpfs") - engine = create_engine( -diff --git a/duckdb_engine/tests/test_integration.py b/duckdb_engine/tests/test_integration.py -index 349c976..bf3dbaa 100644 ---- a/duckdb_engine/tests/test_integration.py -+++ b/duckdb_engine/tests/test_integration.py -@@ -24,7 +24,6 @@ def test_integration(engine: Engine) -> None: - conn.execute(text("select * from test_df")) - - --@mark.remote_data - @mark.skipif( - "dev" in duckdb.__version__, reason="md extension not available for dev builds" # type: ignore[attr-defined] - ) diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index 83fd0bbb6908e..34f20998ef3d5 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { # 2. default to extension autoload & autoinstall disabled substituteInPlace setup.py \ --replace-fail "ParallelCompile()" 'ParallelCompile("NIX_BUILD_CORES")' \ - --replace-fail "define_macros.extend([('DUCKDB_EXTENSION_AUTOLOAD_DEFAULT', '1'), ('DUCKDB_EXTENSION_AUTOINSTALL_DEFAULT', '1')])" "" + --replace-fail "define_macros.extend([('DUCKDB_EXTENSION_AUTOLOAD_DEFAULT', '1'), ('DUCKDB_EXTENSION_AUTOINSTALL_DEFAULT', '1')])" "pass" ''; env = { @@ -34,8 +34,6 @@ buildPythonPackage rec { OVERRIDE_GIT_DESCRIBE="v${version}-0-g${rev}"; }; - dontPretendSetuptoolsSCMVersion = true; - nativeBuildInputs = [ pybind11 setuptools-scm diff --git a/pkgs/development/python-modules/sqlglot/default.nix b/pkgs/development/python-modules/sqlglot/default.nix index 7eb9ee70eca91..c25a2c10bc59e 100644 --- a/pkgs/development/python-modules/sqlglot/default.nix +++ b/pkgs/development/python-modules/sqlglot/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sqlglot"; - version = "21.1.1"; + version = "23.12.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { repo = "sqlglot"; owner = "tobymao"; rev = "refs/tags/v${version}"; - hash = "sha256-xMKDkhotVBkLzn+f9RMGCPfWTF4Rz9a193nSJv5z+iA="; + hash = "sha256-VUG/l1iZ/8vAJwhktN/tx8U8KVLgaghUPArtxEyIA54="; }; nativeBuildInputs = [ |