From d9f881f51243eab6cfeaf09df3c5c90a4a8586c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Milenkovi=C4=87?= Date: Wed, 16 Oct 2024 23:55:33 +0100 Subject: [PATCH] fix issue with not building python package ... (#1085) ... and add a python crate test in the workflows --- .github/workflows/rust.yml | 2 ++ python/Cargo.toml | 6 +++--- python/src/context.rs | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index b1832b166..1ffb9e181 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -120,6 +120,8 @@ jobs: cargo test cd examples cargo run --example standalone_sql --features=ballista/standalone + cd ../python + cargo test env: CARGO_HOME: "/github/home/.cargo" CARGO_TARGET_DIR: "/github/home/target" diff --git a/python/Cargo.toml b/python/Cargo.toml index 758d162f3..dbe419d28 100644 --- a/python/Cargo.toml +++ b/python/Cargo.toml @@ -33,9 +33,9 @@ publish = false async-trait = "0.1.77" ballista = { path = "../ballista/client", version = "0.12.0" } ballista-core = { path = "../ballista/core", version = "0.12.0" } -datafusion = { workspace = true } -datafusion-proto = { workspace = true } -datafusion-python = { workspace = true } +datafusion = { version = "42" } +datafusion-proto = { version = "42" } +datafusion-python = { version = "42" } pyo3 = { version = "0.22", features = ["extension-module", "abi3", "abi3-py38"] } pyo3-log = "0.11.0" diff --git a/python/src/context.rs b/python/src/context.rs index be7dd6109..eccdede9e 100644 --- a/python/src/context.rs +++ b/python/src/context.rs @@ -204,7 +204,7 @@ impl PySessionContext { e.into_iter() .map(|f| { let sort_expr: SortExpr = f.into(); - *sort_expr.expr + sort_expr }) .collect() }) @@ -323,7 +323,7 @@ impl PySessionContext { e.into_iter() .map(|f| { let sort_expr: SortExpr = f.into(); - *sort_expr.expr + sort_expr }) .collect() })