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.

Sign up for GitHub

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

Jump to bottom

Remove libprotobuf dep #1249

Merged
merged 26 commits into from
Nov 13, 2023
Merged

Remove libprotobuf dep #1249

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
fa18499
Merge remote-tracking branch 'upstream/main'
jdye64 Apr 13, 2023
d6b470c
Merge remote-tracking branch 'upstream/main'
jdye64 May 2, 2023
856f7c0
Merge remote-tracking branch 'upstream/main'
jdye64 May 8, 2023
4b86547
Merge remote-tracking branch 'upstream/main'
jdye64 May 30, 2023
28fce59
Merge remote-tracking branch 'upstream/main'
jdye64 Jun 14, 2023
4140457
Merge remote-tracking branch 'upstream/main'
jdye64 Aug 28, 2023
36a92a2
Merge remote-tracking branch 'upstream/main'
jdye64 Oct 24, 2023
41b50f6
Remove libprotobuf dependency from build
jdye64 Oct 24, 2023
b393dcd
Remove protoc install step from workflows
jdye64 Oct 24, 2023
aec7a5c
Remove conda managed c-compiler and add patchelf
jdye64 Oct 25, 2023
6084558
Remove patchelf
jdye64 Oct 25, 2023
74f84db
Change from c-compiler to gcc 12.3.0
jdye64 Oct 25, 2023
ca7aa8f
Point to new ADP branch that makes substrait completely optional
jdye64 Oct 25, 2023
cf426ee
Update Cargo.lock file
jdye64 Oct 25, 2023
35f5927
Resolve syntax issues encountered due to bumping to ADP 32 from 28
jdye64 Oct 25, 2023
11e89e5
Bump Rustc version to 1.73 because minimum 1.70 is needed for newest …
jdye64 Oct 25, 2023
31c7ca2
Update cargo tests to use the latest expected output from bump to ADP 32
jdye64 Oct 25, 2023
6ecb871
Clean-ups and point to commit needed from ADP
jdye64 Oct 26, 2023
eb9760f
Remove patchelf as it isn't required just would have been a nice to h…
jdye64 Oct 26, 2023
078d279
Merge branch 'main' into remove_libprotobuf_dep
jdye64 Nov 7, 2023
3a76b29
Remove protoc installation logic from wheels workflow
charlesbluca Nov 7, 2023
f6568b1
Remove zlib from conda nightly host deps
charlesbluca Nov 7, 2023
56f5cf4
Consistently pin to maturin 1.3
charlesbluca Nov 7, 2023
0bcf77f
Merge remote-tracking branch 'upstream/main' into pr/jdye64/1249
charlesbluca Nov 7, 2023
1978fb8
Try adding c-compiler back to conda env
charlesbluca Nov 8, 2023
aed5f0f
Merge remote-tracking branch 'upstream/main' into pr/jdye64/1249
charlesbluca Nov 8, 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
11 changes: 0 additions & 11 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,6 @@ jobs:
target: [x86_64, aarch64]
steps:
- uses: actions/checkout@v3
- name: Install Protoc
uses: arduino/setup-protoc@v1
if: matrix.target == 'aarch64'
with:
version: '3.x'
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/setup-python@v4
with:
python-version: '3.10'
Expand Down Expand Up @@ -121,11 +115,6 @@ jobs:
target: [x86_64, aarch64]
steps:
- uses: actions/checkout@v3
- name: Install Protoc
uses: arduino/setup-protoc@v1
with:
version: '3.x'
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/setup-python@v4
with:
python-version: '3.10'
Expand Down
15 changes: 0 additions & 15 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@ 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 }}

# Check crate compiles
linux-build-lib:
Expand All @@ -52,11 +47,6 @@ jobs:
if: needs.detect-ci-trigger.outputs.triggered == 'true'
run: |
bash continuous_integration/scripts/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: |
cargo check
Expand All @@ -82,11 +72,6 @@ jobs:
if: needs.detect-ci-trigger.outputs.triggered == 'true'
run: |
bash continuous_integration/scripts/update-dependencies.sh
- name: Install Protoc
uses: arduino/setup-protoc@v1
with:
version: '3.x'
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Run tests
run: |
cargo test
5 changes: 0 additions & 5 deletions .github/workflows/style.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@ 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: 0 additions & 5 deletions .github/workflows/test-upstream.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,6 @@ jobs:
# https://github.com/dask-contrib/dask-sql/pull/1143
python-version: "3.9"
channel-priority: strict
- name: Install Protoc
uses: arduino/setup-protoc@v1
with:
version: '3.x'
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Optionally update upstream cargo dependencies
if: env.which_upstream == 'DataFusion'
env:
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,6 @@ jobs:
# https://github.com/dask-contrib/dask-sql/pull/1143
python-version: ${{ needs.detect-ci-trigger.outputs.triggered == 'true' && '3.9' || '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: |
pip install -e . -vv
Expand Down
Loading
Loading