From 6c0def8319256fe880bcf0dac2483ca78d7eaac7 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Wed, 30 Oct 2024 06:36:03 -0400 Subject: [PATCH] python3.pkgs.ibis-framework: patch tests for arrow 18 --- .../python-modules/ibis-framework/default.nix | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index 080168ec2287..5a4ab305b1b7 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -54,11 +54,7 @@ typing-extensions, }: let - testBackends = [ - "duckdb" - "sqlite" - "datafusion" - ]; + testBackends = [ "duckdb" "sqlite" ]; ibisTestingData = fetchFromGitHub { name = "ibis-testing-data"; @@ -92,9 +88,17 @@ buildPythonPackage rec { url = "https://github.com/ibis-project/ibis/commit/a54eceabac1d6592e9f6ab0ca7749e37a748c2ad.patch"; hash = "sha256-j5BPYVqnEF9GQV5N3/VhFUCdsEwAIOQC0KfZ5LNBSRg="; }) + + # remove after the 10.0 release + (fetchpatch { + name = "ibis-framework-arrow-18.patch"; + url = "https://github.com/ibis-project/ibis/commit/5dc549b22c2eca29a11a31fb29deef7c1466a204.patch"; + hash = "sha256-4i/g2uixdlkbE6x659wzZJ91FZpzwOVkF6ZeXkiCP3I="; + excludes = [ "poetry.lock" "requirements-dev.txt" ]; + }) ]; - nativeBuildInputs = [ + build-system = [ poetry-core poetry-dynamic-versioning ]; @@ -102,7 +106,7 @@ buildPythonPackage rec { dontBypassPoetryDynamicVersioning = true; env.POETRY_DYNAMIC_VERSIONING_BYPASS = lib.head (lib.strings.splitString "-" version); - propagatedBuildInputs = [ + dependencies = [ atpublic parsy python-dateutil @@ -128,13 +132,7 @@ buildPythonPackage rec { pytest-xdist ] ++ lib.concatMap (name: optional-dependencies.${name}) testBackends; - dontUsePytestXdist = true; - - pytestFlagsArray = [ - "-m" - # tpcds and tpch are slow, so disable them - "'not tpcds and not tpch and (${lib.concatStringsSep " or " testBackends} or core)'" - ]; + pytestFlagsArray = [ "-m" "'${lib.concatStringsSep " or " testBackends} or core'" ]; disabledTests = [ # tries to download duckdb extensions