Unverified Commit f3017738 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #307241 from annaleeleaves/duckdb-updates 

duckdb, python311Packages.duckdb: 0.10.1 -> 0.10.2
parents 1207d1b4 37bd9c17

pkgs/development/libraries/duckdb/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -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"

pkgs/development/libraries/duckdb/versions.json

+3 −3
Original line number Diff line number Diff line 
{

  "version": "0.10.1",

  "rev": "4a89d97db8a5a23a15f3025c8d2d2885337c2637",

  "hash": "sha256-/j/DaUzsfACI5Izr4lblkYmIEmKsOXr760UTwC0l/qg="

  "version": "0.10.2",

  "rev": "1601d94f94a7e0d2eb805a94803eb1e3afbbe4ed",

  "hash": "sha256-CTZ90KJvLPQqu1FYciEWsxJbvybCjeBsi/12bkfVd9Q="

}

pkgs/development/python-modules/duckdb-engine/default.nix

+14 −11
Original line number Diff line number Diff line
@@ -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"

  ];

pkgs/development/python-modules/duckdb-engine/remote_data.patch

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
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]

 )

pkgs/development/python-modules/duckdb/default.nix

+1 −3
Original line number Diff line number Diff line
@@ -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