upgrade maturin to 0.15.1 (#379)

* upgrade maturin to 0.15.1 * migrate maturin meta
apache · May 10, 2023 · 43b3105 · 43b3105
1 parent 21ad90f
commit 43b3105
Show file tree

Hide file tree

Showing 9 changed files with 232 additions and 479 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -64,7 +64,7 @@ jobs:
         run: python -m pip install --upgrade pip
 
       - name: Install maturin
-        run: pip install maturin==0.14.2
+        run: pip install maturin==0.15.1
 
       - run: rm LICENSE.txt
       - name: Download LICENSE.txt
@@ -76,7 +76,7 @@ jobs:
       - name: Install Protoc
         uses: arduino/setup-protoc@v1
         with:
-          version: '3.x'
+          version: "3.x"
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Python package
@@ -125,7 +125,7 @@ jobs:
         run: python -m pip install --upgrade pip
 
       - name: Install maturin
-        run: pip install maturin==0.14.2
+        run: pip install maturin==0.15.1
 
       - run: rm LICENSE.txt
       - name: Download LICENSE.txt
@@ -137,7 +137,7 @@ jobs:
       - name: Install Protoc
         uses: arduino/setup-protoc@v1
         with:
-          version: '3.x'
+          version: "3.x"
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Python package

diff --git a/Cargo.toml b/Cargo.toml
@@ -61,9 +61,6 @@ pyo3-build-config = "0.18.3"
 name = "datafusion_python"
 crate-type = ["cdylib", "rlib"]
 
-[package.metadata.maturin]
-name = "datafusion._internal"
-
 [profile.release]
 lto = true
 codegen-units = 1
diff --git a/conda/environments/datafusion-dev.yaml b/conda/environments/datafusion-dev.yaml
@@ -16,29 +16,29 @@
 # under the License.
 
 channels:
-- conda-forge
+  - conda-forge
 dependencies:
-- black
-- flake8
-- isort
-- maturin
-- mypy
-- numpy
-- pyarrow
-- pytest
-- toml
-- importlib_metadata
-- python>=3.10
-# Packages useful for building distributions and releasing
-- mamba
-- conda-build
-- anaconda-client
-# Packages for documentation building
-- sphinx
-- pydata-sphinx-theme==0.8.0
-- myst-parser
-- jinja2
-# GPU packages
-- cudf
-- cudatoolkit=11.8
+  - black
+  - flake8
+  - isort
+  - maturin>=0.15
+  - mypy
+  - numpy
+  - pyarrow>=11.0.0
+  - pytest
+  - toml
+  - importlib_metadata
+  - python>=3.10
+  # Packages useful for building distributions and releasing
+  - mamba
+  - conda-build
+  - anaconda-client
+  # Packages for documentation building
+  - sphinx
+  - pydata-sphinx-theme==0.8.0
+  - myst-parser
+  - jinja2
+  # GPU packages
+  - cudf
+  - cudatoolkit=11.8
 name: datafusion-dev
diff --git a/conda/recipes/meta.yaml b/conda/recipes/meta.yaml
@@ -35,12 +35,12 @@ build:
 
 requirements:
   host:
-    - python >=3.6
-    - maturin >=0.14,<0.15
+    - python >=3.7
+    - maturin >=0.15,<0.16
     - libprotobuf =3
     - pip
   run:
-    - python >=3.6
+    - python >=3.7
     - pyarrow >=11.0.0
 
 test:

diff --git a/docs/README.md b/docs/README.md
@@ -19,17 +19,18 @@
 
 # DataFusion Documentation
 
-This folder contains the source content of the [python api](./source/api).
+This folder contains the source content of the [Python API](./source/api).
 This is published to https://arrow.apache.org/datafusion-python/ by a GitHub action
 when changes are merged to the main branch.
 
 ## Dependencies
 
 It's recommended to install build dependencies and build the documentation
-inside a Python virtualenv.
+inside a Python `venv`.
 
-- Python
-- `pip3 install -r requirements.txt`
+```bash
+python -m pip install -r requirements-310.txt
+```
 
 ## Build & Preview
 
@@ -57,8 +58,6 @@ version of the docs, follow these steps:
 2. Clone the arrow-site repo
 3. Checkout to the `asf-site` branch (NOT `master`)
 4. Copy build artifacts into `arrow-site` repo's `datafusion` folder with a command such as
-
-- `cp -rT ./build/html/ ../../arrow-site/datafusion/` (doesn't work on mac)
-- `rsync -avzr ./build/html/ ../../arrow-site/datafusion/`
-
+   - `cp -rT ./build/html/ ../../arrow-site/datafusion/` (doesn't work on mac)
+   - `rsync -avzr ./build/html/ ../../arrow-site/datafusion/`
 5. Commit changes in `arrow-site` and send a PR.
diff --git a/pyproject.toml b/pyproject.toml
@@ -16,7 +16,7 @@
 # under the License.
 
 [build-system]
-requires = ["maturin>=0.14,<0.15"]
+requires = ["maturin>=0.15,<0.16"]
 build-backend = "maturin"
 
 [project]
@@ -55,6 +55,7 @@ repository = "https://github.com/apache/arrow-datafusion-python"
 profile = "black"
 
 [tool.maturin]
+module-name = "datafusion._internal"
 include = [
     { path = "Cargo.lock", format = "sdist" }
 ]

diff --git a/requirements-310.txt b/requirements-310.txt
diff --git a/requirements.in b/requirements.in
@@ -18,10 +18,10 @@
 black
 flake8
 isort
-maturin>=0.14
+maturin>=0.15
 mypy
 numpy
-pyarrow
+pyarrow>=11.0.0
 pytest
 toml
 importlib_metadata; python_version < "3.8"