From a7d41d4e028c50c3c6135946e345f7d093687573 Mon Sep 17 00:00:00 2001 From: annalee <168274788+annaleeleaves@users.noreply.github.com> Date: Sun, 21 Apr 2024 17:14:17 +0000 Subject: [PATCH 1/4] python311Packages.duckdb: fix setup.py substitutions, use scm pretend version replacement in setup.py is now indented in an if statement so replace with 'pass' rather than an empty string to fix parse errors OVERRIDE_GIT_DESCRIBE broke and no longer defines the version and thus requires SETUPTOOLS_SCM_PRETEND_VERSION --- pkgs/development/python-modules/duckdb/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index 83fd0bbb6908..34f20998ef3d 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 From 47ac2255fe8c77b57fb3663d9f9d4a48bc914ec5 Mon Sep 17 00:00:00 2001 From: annalee <168274788+annaleeleaves@users.noreply.github.com> Date: Sun, 21 Apr 2024 17:14:47 +0000 Subject: [PATCH 2/4] duckdb, python311Packages.duckdb: 0.10.1 -> 0.10.2 https://github.com/duckdb/duckdb/releases/tag/v0.10.2 --- pkgs/development/libraries/duckdb/default.nix | 1 + pkgs/development/libraries/duckdb/versions.json | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index 03857e962a83..343574f251a8 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 efb151413e3d..de679be88599 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=" } From c813ec9a6b2eda15f7d21aaf1830bd73c6bf389e Mon Sep 17 00:00:00 2001 From: annalee <168274788+annaleeleaves@users.noreply.github.com> Date: Mon, 22 Apr 2024 00:51:24 +0000 Subject: [PATCH 3/4] python311Packages.sqlgot: 21.1.1 -> 23.12.1 https://github.com/tobymao/sqlglot/releases/tag/v23.12.1 https://github.com/tobymao/sqlglot/compare/v21.1.1...v23.12.1 --- pkgs/development/python-modules/sqlglot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlglot/default.nix b/pkgs/development/python-modules/sqlglot/default.nix index 7eb9ee70eca9..c25a2c10bc59 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 = [ From 37bd9c17b2730762790dfe0297f20fd1f7e0f828 Mon Sep 17 00:00:00 2001 From: annalee <168274788+annaleeleaves@users.noreply.github.com> Date: Mon, 22 Apr 2024 00:53:25 +0000 Subject: [PATCH 4/4] python311Packages.duckdb-engine: 0.11.2 -> 0.12.0 https://github.com/Mause/duckdb_engine/releases/tag/v0.12.0 https://github.com/Mause/duckdb_engine/compare/v0.11.2...v0.12.0 --- .../python-modules/duckdb-engine/default.nix | 25 +++++++++++-------- .../duckdb-engine/remote_data.patch | 24 ------------------ 2 files changed, 14 insertions(+), 35 deletions(-) delete mode 100644 pkgs/development/python-modules/duckdb-engine/remote_data.patch diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix index 955334bdf283..be851c7e16fa 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 1c887acf6cae..000000000000 --- 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] - )