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

Fix update cargo dependencies script for Mac OS X #1010

Open
wants to merge 4 commits into
base: main
Choose a base branch
from

Conversation

ayushdg
Copy link
Collaborator

@ayushdg ayushdg commented Jan 25, 2023

The existing update-dependencies.sh script fails on Mac OS X as seen in these runs. This updates the script to use the -E as discussed in the comments here.

Copy link
Collaborator

@charlesbluca charlesbluca left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @ayushdg! LGTM

One thing this PR highlights is that we should add an option to use upstream DataFusion as part of the Python testing matrix, so that we could verify that this change fixes the issues on macOS; right now we only have this option for the Rust testing, which is limited to Ubuntu

@codecov-commenter
Copy link

codecov-commenter commented Jan 25, 2023

Codecov Report

Merging #1010 (7bd4eac) into main (08cff1a) will increase coverage by 0.11%.
The diff coverage is n/a.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@            Coverage Diff             @@
##             main    #1010      +/-   ##
==========================================
+ Coverage   80.47%   80.59%   +0.11%     
==========================================
  Files          75       75              
  Lines        4231     4231              
  Branches      765      765              
==========================================
+ Hits         3405     3410       +5     
+ Misses        662      653       -9     
- Partials      164      168       +4     
Impacted Files Coverage Δ
dask_sql/_version.py 35.31% <0.00%> (+1.41%) ⬆️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@ayushdg
Copy link
Collaborator Author

ayushdg commented Jan 25, 2023

Good point. It should be fairly straightforward to add the same logic from the rust testing to our python test matrix as well. Happy to include in this pr

Copy link
Collaborator

@jdye64 jdye64 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@charlesbluca
Copy link
Collaborator

Happy to include in this pr

Sounds good to me

@ayushdg ayushdg marked this pull request as draft January 25, 2023 15:16
@ayushdg ayushdg marked this pull request as ready for review January 25, 2023 21:37
@ayushdg
Copy link
Collaborator Author

ayushdg commented Jan 25, 2023

Link to a run with [test-df-upstream] enabled.

@ayushdg
Copy link
Collaborator Author

ayushdg commented Jan 26, 2023

@charlesbluca should be ready for another round of reviews

Comment on lines -20 to +47
detect-ci-trigger:
name: Check for upstream trigger phrase
detect-upstream-trigger:
name: Check for upstream trigger phrase to test with upstream dask
runs-on: ubuntu-latest
if: github.repository == 'dask-contrib/dask-sql'
outputs:
triggered: ${{ steps.detect-trigger.outputs.trigger-found }}
triggered: ${{ steps.detect-upstream-trigger.outputs.trigger-found }}
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 2
- uses: xarray-contrib/[email protected]
id: detect-trigger
id: detect-upstream-trigger
with:
keyword: "[test-upstream]"
detect-datafusion-upstream-trigger:
name: Check for upstream trigger phrase to test with upstream datafusion
runs-on: ubuntu-latest
if: github.repository == 'dask-contrib/dask-sql'
outputs:
triggered: ${{ steps.detect-datafusion-upstream-trigger.outputs.trigger-found }}
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 2
- uses: xarray-contrib/[email protected]
id: detect-datafusion-upstream-trigger
with:
keyword: "[test-df-upstream]"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since these are fairly quick steps, wonder if it would make sense to consolidate this into a single job with two steps?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants