Skip to content

Commit

Permalink
DataFusion 41, arrow-rs 52.2, sqlparser 0.49, pyo3 0.21.1 (#504)
Browse files Browse the repository at this point in the history
* compile for DataFusion 38

* fix python build

* Fix pyo3 deprecations

* empty array now Int64

* Fix timezone handling

* fix deprecations

* fix deprecations

* Don't expect pandas to be imported under altair

* update to datafusion 40

* update to datafusion 41

* Update macos images

* DataFusion 41 fixes

* macos-13

* Remove coalesce usage from pivot transform

* fixes

* Fix stack

* macos-13

* back to macos-latest

* fix test

* fix pivot

* Cast pivot value to type of columns

* fix stack expected

* Use arm image for macos rust tests, intel image for python tests

* Try macos requirement in pixi.toml

* break cache

* debug

* macos-14

* all the tests!
  • Loading branch information
jonmmease authored Aug 14, 2024
1 parent 5fe3267 commit 903b2c4
Show file tree
Hide file tree
Showing 72 changed files with 2,352 additions and 1,699 deletions.
29 changes: 13 additions & 16 deletions .github/workflows/build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
os:
- ubuntu-20.04
- windows-2022
- macos-11
- macos-14
steps:
- name: Check out repository code
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # [email protected]
Expand All @@ -45,7 +45,7 @@ jobs:
- name: Cache
uses: actions/cache@v3
with:
key: ${{ runner.os }}-${{ hashFiles('pixi.lock', 'Cargo.lock') }}-test-rust
key: ${{ runner.os }}-${{ hashFiles('pixi.lock', 'Cargo.lock') }}-test-rust2
path: |
~/.cargo
target
Expand Down Expand Up @@ -179,7 +179,7 @@ jobs:
target/wheels/*.whl
build-vegafusion-python-embed-osx-64:
runs-on: macos-11
runs-on: macos-12
steps:
- name: Check out repository code
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # [email protected]
Expand All @@ -206,7 +206,7 @@ jobs:
target/wheels/*.whl
build-vegafusion-python-embed-osx-arm64:
runs-on: macos-11
runs-on: macos-14
steps:
- name: Check out repository code
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # [email protected]
Expand All @@ -221,9 +221,8 @@ jobs:
~/.cargo
target
.pixi
- name: Build vegafusion-server
- name: Build vegafusion-python-embed
run: |
pixi run python automation/download_rust_target.py aarch64-apple-darwin
pixi run build-py-embed --target aarch64-apple-darwin
- name: Upload artifacts
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # [email protected]
Expand Down Expand Up @@ -327,9 +326,9 @@ jobs:
working-directory: python/vegafusion/
run: pytest

test-vegafusion-python-osx-64:
runs-on: macos-11
needs: [build-vegafusion-python-embed-osx-64, build-vegafusion-packages]
test-vegafusion-python-osx-arm64:
runs-on: macos-14
needs: [build-vegafusion-python-embed-osx-arm64, build-vegafusion-packages]
steps:
- name: Check out repository code
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # [email protected]
Expand All @@ -352,9 +351,8 @@ jobs:
run: |
ls -la
python -m pip install vegafusion-*.whl
python -m pip install vegafusion_python_embed-*macosx_10_*_x86_64.whl
python -m pip install pytest vega-datasets polars-lts-cpu "duckdb>=1.0" vl-convert-python scikit-image "pandas>=2.2"
python -m pip install pyarrow==10.0 altair==5.1.2
python -m pip install vegafusion_python_embed-*macosx_11_*_arm64.whl
python -m pip install pytest vega-datasets polars "duckdb>=1.0" vl-convert-python scikit-image "pandas>=2.2"
- name: Test vegafusion
working-directory: python/vegafusion/
run: pytest
Expand Down Expand Up @@ -389,7 +387,7 @@ jobs:
python -m pip install $vegafusion
python -m pip install $vegafusion_python_embed
python -m pip install pytest vega-datasets polars[timezone] "duckdb>=1.0" vl-convert-python scikit-image
python -m pip install pytest pyarrow==10.0 altair==5.1.2 vega-datasets polars[timezone] "duckdb>=1.0" vl-convert-python scikit-image
- name: Test vegafusion
working-directory: python/vegafusion/
run: pytest
Expand Down Expand Up @@ -592,7 +590,7 @@ jobs:
vegafusion-server-*
build-vegafusion-server-osx-64:
runs-on: macos-11
runs-on: macos-13
steps:
- name: Check out repository code
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # [email protected]
Expand Down Expand Up @@ -623,7 +621,7 @@ jobs:
vegafusion-server-*
build-vegafusion-server-osx-arm64:
runs-on: macos-11
runs-on: macos-14
steps:
- name: Check out repository code
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # [email protected]
Expand All @@ -640,7 +638,6 @@ jobs:
.pixi
- name: Build vegafusion-server
run: |
pixi run python automation/download_rust_target.py aarch64-apple-darwin
pixi run build-rs-vegafusion-server --target aarch64-apple-darwin
- name: zip executable
uses: vimtor/action-zip@26a249fb00d43ca98dad77a4b3838025fc226aa1 # [email protected]
Expand Down
Loading

0 comments on commit 903b2c4

Please sign in to comment.