Skip to content

Commit

Permalink
chore: update to maturin's recommended project layout for rust/python… (
Browse files Browse the repository at this point in the history
#695)

* chore: update to maturin's recommended project layout for rust/python projects

The previous layout leads to an import error when installing with `maturin build` and `pip install .`.

This error was common enough that `maturin` changed the recommended project layout to what this commit does.

A prior PR attempted to solve this by altering `lib.name` in Cargo.toml, but that did not work for me.

- [Prior PR](#694)
- [maturin ImportError issue](PyO3/maturin#490)
- [maturin changes recommended project structure](PyO3/maturin#855)

* ci: update `ruff check` for nested python directory
  • Loading branch information
Michael-J-Ward authored May 14, 2024
1 parent 01a370e commit 0c82b3f
Show file tree
Hide file tree
Showing 29 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
pip install ruff
# Update output format to enable automatic inline annotations.
- name: Run Ruff
run: ruff check --output-format=github datafusion
run: ruff check --output-format=github python/

generate-license:
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ repository = "https://github.com/apache/arrow-datafusion-python"
profile = "black"

[tool.maturin]
python-source = "python"
module-name = "datafusion._internal"
include = [
{ path = "Cargo.lock", format = "sdist" }
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 0c82b3f

Please sign in to comment.