Clean-ups and point to commit needed from ADP

dask-contrib · Oct 26, 2023 · 6ecb871 · 6ecb871
1 parent 31c7ca2
commit 6ecb871
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 32 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,7 +11,7 @@ include = ["/src", "/dask_sql", "/LICENSE.txt", "pyproject.toml", "Cargo.toml",
 
 [dependencies]
 async-trait = "0.1.71"
-datafusion-python = { git = "https://github.com/jdye64/arrow-datafusion-python.git", branch = "remove_libprotobuf_dep" }
+datafusion-python = { git = "https://github.com/apache/arrow-datafusion-python.git", ref = "da6c183" }
 env_logger = "0.10"
 log = "^0.4"
 pyo3 = { version = "0.19.1", features = ["extension-module", "abi3", "abi3-py38"] }

diff --git a/continuous_integration/environment-3.10-dev.yaml b/continuous_integration/environment-3.10-dev.yaml
@@ -36,3 +36,4 @@ dependencies:
 - tzlocal>=2.1
 - uvicorn>=0.13.4
 - zlib
+- patchelf
diff --git a/continuous_integration/environment-3.8-dev.yaml b/continuous_integration/environment-3.8-dev.yaml
@@ -36,3 +36,4 @@ dependencies:
 - tzlocal=2.1
 - uvicorn=0.13.4
 - zlib
+- patchelf
diff --git a/continuous_integration/environment-3.9-dev.yaml b/continuous_integration/environment-3.9-dev.yaml
@@ -36,3 +36,4 @@ dependencies:
 - tzlocal>=2.1
 - uvicorn>=0.13.4
 - zlib
+- patchelf
diff --git a/continuous_integration/gpuci/environment-3.10.yaml b/continuous_integration/gpuci/environment-3.10.yaml
@@ -39,6 +39,7 @@ dependencies:
 - tpot>=0.12.0
 - tzlocal>=2.1
 - uvicorn>=0.13.4
+- patchelf
 # GPU-specific requirements
 - cudatoolkit=11.5
 - cudf=23.12

diff --git a/continuous_integration/gpuci/environment-3.9.yaml b/continuous_integration/gpuci/environment-3.9.yaml
@@ -39,6 +39,7 @@ dependencies:
 - tpot>=0.12.0
 - tzlocal>=2.1
 - uvicorn>=0.13.4
+- patchelf
 # GPU-specific requirements
 - cudatoolkit=11.5
 - cudf=23.12

diff --git a/docker/conda.txt b/docker/conda.txt
@@ -21,4 +21,4 @@ intake>=0.6.0
 pre-commit>=2.11.1
 black=22.10.0
 isort=5.12.0
-maturin>=1.1,<1.2
+maturin>=1.3.1
diff --git a/docker/main.dockerfile b/docker/main.dockerfile
@@ -14,7 +14,7 @@ ENV PATH="/root/.cargo/bin:${PATH}"
 COPY docker/conda.txt /opt/dask_sql/
 RUN mamba install -y \
     # build requirements
-    "maturin>=1.1,<1.2" \
+    "maturin>=1.3.1" \
     # core dependencies
     "dask>=2022.3.0" \
     "pandas>=1.4.0" \

diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt
@@ -11,4 +11,4 @@ tzlocal>=2.1
 prompt_toolkit>=3.0.8
 pygments>=2.7.1
 tabulate
-maturin>=1.1,<1.2
+maturin>=1.3.1
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["maturin>=1.1,<1.2"]
+requires = ["maturin>=1.3.1"]
 build-backend = "maturin"
 
 [project]