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

cli: add cargo.lock #2112

Merged
merged 5 commits into from
Apr 4, 2022
Merged

cli: add cargo.lock #2112

merged 5 commits into from
Apr 4, 2022

Conversation

happysalada
Copy link
Contributor

@happysalada happysalada commented Mar 29, 2022

Which issue does this PR close?

Add a cargo.lock to enable packaging for different os.

Since cargo will not tolerate a lock that is not at the root of the workspace, I had to add the lock there.
I've added some exclude statements for it not to be included for all the other libraries.

Closes #2071

Are there any user-facing changes?

None

@github-actions github-actions bot added ballista datafusion Changes in the datafusion crate labels Mar 29, 2022
@houqp
Copy link
Member

houqp commented Mar 29, 2022

@happysalada I think you need to put the lock file inside the datafusion-cli directory instead.

@houqp
Copy link
Member

houqp commented Mar 29, 2022

Ha, I saw your other comment now, @happysalada you need to exclude datafusion-cli from the root workspace by removing it from https://github.com/apache/arrow-datafusion/blob/b7d3bb1e3f2a884fc0775dc9dc869ae77b226269/Cargo.toml#L26. Then add it to an exclude list, something like this: https://github.com/delta-io/delta-rs/blob/346f51a277c23be09eca373cd6d775b745d59c05/Cargo.toml#L10

@happysalada
Copy link
Contributor Author

I had another go at it doing what you suggested, let me know.

@happysalada
Copy link
Contributor Author

@houqp let me know what you think when you have a moment. (no worries if you are busy).

@houqp houqp removed the ballista label Apr 2, 2022
@houqp
Copy link
Member

houqp commented Apr 2, 2022

LGTM, thanks @happysalada

Copy link
Contributor

@alamb alamb left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks @happysalada and @houqp

The CI was failing as datafusion-cli is not part of the workspace anymore

https://github.com/apache/arrow-datafusion/runs/5797584094?check_suite_focus=true

I pushed a small change in 30341de to fix

@alamb
Copy link
Contributor

alamb commented Apr 3, 2022

Looks like the integration test also wants to use datafusion-cli and the build script needs to be updated

https://github.com/apache/arrow-datafusion/runs/5799193929?check_suite_focus=true

@happysalada
Copy link
Contributor Author

it looks like 2 more files need to be updated.
I've updated the python integration tests file.
however the workflow file also needs to be modified here 30341de#diff-73e17259d77e5fbef83b2bdbbe4dc40a912f807472287f7f45b77e0cbf78792dL213
I don't think I can do that though.

@alamb
Copy link
Contributor

alamb commented Apr 4, 2022

cc @jimexist

@alamb alamb merged commit a0d8b66 into apache:master Apr 4, 2022
@alamb
Copy link
Contributor

alamb commented Apr 4, 2022

Thanks @happysalada

MazterQyou pushed a commit to cube-js/arrow-datafusion that referenced this pull request Sep 1, 2022
* datafusion-cli: add Cargo.lock

* fix: update CI check for datafusion-cli

* Update Cargo.lock for changes in datafusion project org

* datafusion-cli/tests: run with separate cargo.lock

Co-authored-by: Andrew Lamb <[email protected]>
MazterQyou pushed a commit to cube-js/arrow-datafusion that referenced this pull request Sep 2, 2022
* datafusion-cli: add Cargo.lock

* fix: update CI check for datafusion-cli

* Update Cargo.lock for changes in datafusion project org

* datafusion-cli/tests: run with separate cargo.lock

Co-authored-by: Andrew Lamb <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
datafusion Changes in the datafusion crate
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Commiting the Cargo.lock
3 participants