Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add arrow datafusion python dependency #1085

Merged
merged 60 commits into from
May 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
14932ad
Introduce Arrow-DataFusion-Python, the new Apache Arrow community Pyt…
jdye64 Mar 13, 2023
6ccf087
Merge remote-tracking branch 'upstream/main' into add_arrow_datafusio…
jdye64 Mar 14, 2023
62d49bd
point to test upstream branch with custom build command
jdye64 Mar 14, 2023
cdc236b
update conda build recipe to include rust compiler and setuptools-rus…
jdye64 Mar 14, 2023
9604b3e
update cargo lock
jdye64 Mar 14, 2023
dece095
lower setuptools-rust version for a test
jdye64 Mar 14, 2023
a48e587
Merge branch 'main' into add_arrow_datafusion_python
jdye64 Mar 14, 2023
5c141b2
Add actions for Rust environment setup
jdye64 Mar 14, 2023
605fd92
fix workflow syntax issue
jdye64 Mar 14, 2023
ded1595
Add RUSTFMT which output
jdye64 Mar 14, 2023
291f117
Set rustfmt environment variable and validate it sticks
jdye64 Mar 14, 2023
5800478
Updated Cargo.lock
jdye64 Mar 14, 2023
b4ce6bd
Add RUSTFMT to the export script_env variables for the conda build
jdye64 Mar 14, 2023
e8e037e
Set default to stable
jdye64 Mar 15, 2023
b59a7d8
Merge branch 'arrow_datafusion_python_refactor' into add_arrow_datafu…
jdye64 Mar 16, 2023
35bc094
Point to typify version with rustfmt fix, and update conda build file
jdye64 Mar 16, 2023
4e6228b
Merge branch 'add_arrow_datafusion_python' of github.com:jdye64/dask-…
jdye64 Mar 16, 2023
82f7f97
Point to version of arrow-datafusion-python with the typify rustfmt fix
jdye64 Mar 16, 2023
3635939
Refactoring: not from arrow-datafusion-python but general refactoring…
jdye64 Mar 16, 2023
d41b3cd
Add setuptools-rust back to conda meta.yaml recipe from where I had a…
jdye64 Mar 16, 2023
38cfcdf
Remove rust install step and also don't use container amd64/rust
jdye64 Mar 17, 2023
0bf1cda
Add setup-builder back to conda workflow action
jdye64 Mar 17, 2023
c5ca4f0
Run apt-get commands as root
charlesbluca Mar 17, 2023
1f0fc53
Add Rust installation to test.yml
jdye64 Mar 18, 2023
8951791
Add Rust install to Rust.yml file because protoc is now needed when r…
jdye64 Mar 18, 2023
9a57f73
Install protoc
jdye64 Mar 18, 2023
3d1e85e
tests
jdye64 Mar 19, 2023
fa18499
Merge remote-tracking branch 'upstream/main'
jdye64 Apr 13, 2023
cf3d9d4
merge with upstream/main
jdye64 Apr 13, 2023
482fc0a
Change github action files
jdye64 Apr 13, 2023
18e7a39
remove commented out code
jdye64 Apr 13, 2023
8bb5a30
Add protoc action to Rust CI stage
jdye64 Apr 13, 2023
eb394c3
Merge branch 'main' into add_arrow_datafusion_python
jdye64 Apr 13, 2023
1f2560f
Add protoc action to Rust CI stage
jdye64 Apr 13, 2023
cab8072
Add protoc to other CI build steps so that substrait support can now …
jdye64 Apr 13, 2023
bb2bc7b
Add protoc to conda workflow file
jdye64 Apr 13, 2023
3d6b2ce
Add Utf8 parsing support for WindowRanges
jdye64 Apr 15, 2023
3ded007
Get flat_name() from Column. This will include the table name in the …
jdye64 Apr 16, 2023
07aefac
Add protoc to github action step Test importing with bare requirements
jdye64 Apr 16, 2023
8f5b3d3
Fix cargo tests
jdye64 Apr 17, 2023
a984378
Add build.rs and target linker flags to ensure binary is linked again…
jdye64 Apr 17, 2023
cb81c8a
Merge remote-tracking branch 'upstream/main' into add_arrow_datafusio…
jdye64 Apr 17, 2023
24e67bf
Updates for testing
jdye64 Apr 19, 2023
febb742
Merge remote-tracking branch 'upstream/main' into add_arrow_datafusio…
jdye64 Apr 26, 2023
c74d944
Adjustments to fix failing pytests
jdye64 Apr 26, 2023
dc3a162
More Pytest fixes and Rust test fixes
jdye64 Apr 26, 2023
43efde1
Remove mistakenly left inplace breakpoint() calls
jdye64 Apr 26, 2023
6e8738a
Return np.timedelta instead of pd.timedelta for interval_month_day_nano
ayushdg Apr 26, 2023
7b81fb0
protoc changes and small formatting review suggestions
jdye64 Apr 27, 2023
479e908
Merge branch 'add_arrow_datafusion_python' of github.com:jdye64/dask-…
jdye64 Apr 27, 2023
0415b0b
Include protoc back in rust.yml for cargo check command
jdye64 Apr 27, 2023
1d84460
Merge branch 'main' into add_arrow_datafusion_python
ayushdg May 2, 2023
9deb9f0
set avg_days_in_month -> 30. Adjust update_depedencies script to poin…
jdye64 May 2, 2023
1689c5b
Merge branch 'main' into add_arrow_datafusion_python
jdye64 May 2, 2023
b7f1e72
Add back logic for avg_days_in_month
jdye64 May 2, 2023
04a638b
Merge remote-tracking branch 'origin/main' into add_arrow_datafusion_…
charlesbluca May 3, 2023
fe179dd
Set average days per month to 30
charlesbluca May 3, 2023
e1fd425
Adjust PyTest expected results to align with new avg_days_in_month of…
jdye64 May 3, 2023
9d76dcc
merge with upstream
jdye64 May 3, 2023
d08e4ed
Revert timestampdiff changes
charlesbluca May 4, 2023
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
15 changes: 15 additions & 0 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ jobs:
id: detect-trigger
with:
keyword: "[test-df-upstream]"
- name: Install Protoc
uses: arduino/setup-protoc@v1
with:
version: '3.x'
repo-token: ${{ secrets.GITHUB_TOKEN }}
jdye64 marked this conversation as resolved.
Show resolved Hide resolved

# Check crate compiles
linux-build-lib:
Expand All @@ -48,6 +53,11 @@ jobs:
run: |
cd dask_planner
bash update-dependencies.sh
- name: Install Protoc
uses: arduino/setup-protoc@v1
with:
version: '3.x'
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Check workspace in debug mode
run: |
cd dask_planner
Expand Down Expand Up @@ -76,6 +86,11 @@ jobs:
run: |
cd dask_planner
bash update-dependencies.sh
- name: Install Protoc
uses: arduino/setup-protoc@v1
with:
version: '3.x'
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Run tests
run: |
cd dask_planner
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- name: Install Protoc
uses: arduino/setup-protoc@v1
with:
version: '3.x'
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,11 @@ jobs:
use-mamba: true
python-version: "3.8"
channel-priority: strict
- name: Install Protoc
uses: arduino/setup-protoc@v1
with:
version: '3.x'
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Install dependencies and nothing else
run: |
mamba install "setuptools-rust>=1.5.2"
Expand Down
1 change: 1 addition & 0 deletions continuous_integration/environment-3.10-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ dependencies:
- tpot
- tzlocal>=2.1
- uvicorn>=0.13.4
- libprotobuf=3
1 change: 1 addition & 0 deletions continuous_integration/environment-3.8-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ dependencies:
- tpot
- tzlocal=2.1
- uvicorn=0.13.4
- libprotobuf=3
1 change: 1 addition & 0 deletions continuous_integration/environment-3.9-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ dependencies:
- tpot
- tzlocal>=2.1
- uvicorn>=0.13.4
- libprotobuf=3
1 change: 1 addition & 0 deletions continuous_integration/recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ requirements:
- pip
- python
- setuptools-rust >=1.5.2
- libprotobuf =3
run:
- python
- dask >=2022.3.0
Expand Down
11 changes: 11 additions & 0 deletions dask_planner/.cargo/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[target.x86_64-apple-darwin]
jdye64 marked this conversation as resolved.
Show resolved Hide resolved
rustflags = [
"-C", "link-arg=-undefined",
"-C", "link-arg=dynamic_lookup",
]

[target.aarch64-apple-darwin]
rustflags = [
"-C", "link-arg=-undefined",
"-C", "link-arg=dynamic_lookup",
]
Loading