From 738d3e39e0ad538c01a3a57c234509ebad229f1f Mon Sep 17 00:00:00 2001 From: Andy Grove Date: Mon, 10 Apr 2023 12:59:18 -0600 Subject: [PATCH 1/3] include Cargo.toml in source wheel --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 6d8a9d213..456e12b85 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -56,7 +56,8 @@ profile = "black" [tool.maturin] include = [ - { path = "Cargo.lock", format = "sdist" } + { path = "Cargo.lock", format = "sdist" }, + { path = "Cargo.toml", format = "sdist" }, ] exclude = [".github/**", "ci/**", ".asf.yaml"] # Require Cargo.lock is up to date From 297d533bc04d4893074033b0582db0fa2cff8379 Mon Sep 17 00:00:00 2001 From: Andy Grove Date: Mon, 10 Apr 2023 13:26:32 -0600 Subject: [PATCH 2/3] fix source wheel build --- Cargo.toml | 2 +- pyproject.toml | 12 ++++++------ requirements.in | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ddabb2b8c..595db64d9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ readme = "README.md" license = "Apache-2.0" edition = "2021" rust-version = "1.64" -include = ["/src", "/LICENSE.txt"] +include = ["/src", "/datafusion", "/LICENSE.txt", "pyproject.toml", "Cargo.toml", "Cargo.lock"] [features] default = ["mimalloc"] diff --git a/pyproject.toml b/pyproject.toml index 456e12b85..de4fa7732 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,7 @@ # under the License. [build-system] -requires = ["maturin>=0.11,<0.15"] +requires = ["maturin>=0.14,<0.15"] build-backend = "maturin" [project] @@ -55,10 +55,10 @@ repository = "https://github.com/apache/arrow-datafusion-python" profile = "black" [tool.maturin] -include = [ - { path = "Cargo.lock", format = "sdist" }, - { path = "Cargo.toml", format = "sdist" }, -] +#include = [ +# { path = "Cargo.lock", format = "sdist" }, +# { path = "Cargo.toml", format = "sdist" }, +#] exclude = [".github/**", "ci/**", ".asf.yaml"] # Require Cargo.lock is up to date -locked = true +#locked = true diff --git a/requirements.in b/requirements.in index 7ee6a48dc..098e9f809 100644 --- a/requirements.in +++ b/requirements.in @@ -18,7 +18,7 @@ black flake8 isort -maturin +maturin>=0.14 mypy numpy pyarrow From 7a0c37bb55a6e77ed64920255961debdc4852cdd Mon Sep 17 00:00:00 2001 From: Andy Grove Date: Mon, 10 Apr 2023 13:27:43 -0600 Subject: [PATCH 3/3] fix source wheel build --- pyproject.toml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index de4fa7732..87d0be6cf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -55,10 +55,9 @@ repository = "https://github.com/apache/arrow-datafusion-python" profile = "black" [tool.maturin] -#include = [ -# { path = "Cargo.lock", format = "sdist" }, -# { path = "Cargo.toml", format = "sdist" }, -#] +include = [ + { path = "Cargo.lock", format = "sdist" } +] exclude = [".github/**", "ci/**", ".asf.yaml"] # Require Cargo.lock is up to date -#locked = true +locked = true