Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 0 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
48 changes: 24 additions & 24 deletions conda/environments/datafusion-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions conda/recipes/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
15 changes: 7 additions & 8 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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.
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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" }
]
Expand Down
340 changes: 190 additions & 150 deletions requirements-310.txt

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Loading